ffmpeg.git
4 years agoffserver: remove stale debug stanza
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:19:16 +0000 (14:19 -0300)]
ffserver: remove stale debug stanza

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: move assignment outside condition eval
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:15:50 +0000 (14:15 -0300)]
ffserver: move assignment outside condition eval

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: break some too long lines
Reynaldo H. Verdejo Pinochet [Sun, 8 Mar 2015 17:11:35 +0000 (14:11 -0300)]
ffserver: break some too long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agodoc: avoid the incorrect phrase 'allow to'
Andreas Cadhalpun [Sat, 7 Mar 2015 18:36:07 +0000 (19:36 +0100)]
doc: avoid the incorrect phrase 'allow to'

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_curves: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_curves: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sun, 8 Mar 2015 19:59:51 +0000 (20:59 +0100)]
avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

4 years agofate: add test for vp90-2-trac4359.webm
James Almer [Sat, 7 Mar 2015 05:19:04 +0000 (02:19 -0300)]
fate: add test for vp90-2-trac4359.webm

Regression test for the bug from trac ticket #4359 fixed in commit efff3854

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'
Michael Niedermayer [Sun, 8 Mar 2015 18:55:09 +0000 (19:55 +0100)]
Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'
Michael Niedermayer [Sun, 8 Mar 2015 18:44:09 +0000 (19:44 +0100)]
Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'

* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8':
  xcbgrab: Free the host string after checking the connection

Conflicts:
libavdevice/xcbgrab.c

No change as the bug was not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0025f7408a0fab2cab4a950064e4784a67463994'
Michael Niedermayer [Sun, 8 Mar 2015 18:09:32 +0000 (19:09 +0100)]
Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'

* commit '0025f7408a0fab2cab4a950064e4784a67463994':
  vorbis: Check the vlc value in setup_classifs

Conflicts:
libavcodec/vorbisdec.c

See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '62de77ffcaebd42fe685b8426da56b89b2532318'
Michael Niedermayer [Sun, 8 Mar 2015 17:56:07 +0000 (18:56 +0100)]
Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'

* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomxfdec: Fix the error handling for when strftime fails
Martin Storsjö [Sat, 7 Mar 2015 22:19:45 +0000 (00:19 +0200)]
mxfdec: Fix the error handling for when strftime fails

The str variable is a char ** here.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/filters: Add some random examples for fftfilt
Michael Niedermayer [Sat, 7 Mar 2015 22:22:34 +0000 (23:22 +0100)]
doc/filters: Add some random examples for fftfilt

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: included uses_2pass member in vp9_ref_frame().
Ronald S. Bultje [Sun, 8 Mar 2015 13:21:42 +0000 (09:21 -0400)]
vp9: included uses_2pass member in vp9_ref_frame().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoxcbgrab: Free the host string after checking the connection
Luca Barbato [Thu, 5 Mar 2015 08:44:55 +0000 (09:44 +0100)]
xcbgrab: Free the host string after checking the connection

Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org
4 years agovorbis: Check the vlc value in setup_classifs
Luca Barbato [Tue, 3 Mar 2015 10:05:15 +0000 (11:05 +0100)]
vorbis: Check the vlc value in setup_classifs

The valid returned values are always at most 11bit.
Remove the previous check that assumed larger values plausible and
use a signed integer to check get_vlc2 return values.

CC: libav-stable@libav.org
4 years agovorbis: Use a local codebook variable
Luca Barbato [Tue, 3 Mar 2015 09:32:26 +0000 (10:32 +0100)]
vorbis: Use a local codebook variable

Makes the code a little simpler.

4 years agovp9: split segmentation map / mvpair references.
Ronald S. Bultje [Sun, 8 Mar 2015 11:49:29 +0000 (07:49 -0400)]
vp9: split segmentation map / mvpair references.

This prevents a memcpy if segmentation.update_map == false.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_astats: redo zero channel handling
Paul B Mahol [Sun, 8 Mar 2015 11:06:45 +0000 (11:06 +0000)]
avfilter/af_astats: redo zero channel handling

Suggested-by: Nicolas George
Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'
Michael Niedermayer [Sun, 8 Mar 2015 10:38:55 +0000 (11:38 +0100)]
Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'

* commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8':
  rmdec: Improve message for demux error

See: 3880b4541ace2697f380ae1f43cb2299efeb2cc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_astats: Avoid Zero division in print part.
Martin Vignali [Sun, 8 Mar 2015 08:41:27 +0000 (08:41 +0000)]
avfilter/af_astats: Avoid Zero division in print part.

4 years agormdec: Improve message for demux error
Carl Eugen Hoyos [Thu, 5 Mar 2015 16:42:45 +0000 (16:42 +0000)]
rmdec: Improve message for demux error

Use correct context, reduce log level, don't assume it is a video stream,
and print the tag of the unknown stream.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/vc1_mc: optimize get_chroma_mv, and add get_luma_mv
zhaoxiu.zeng [Sat, 7 Mar 2015 15:17:53 +0000 (23:17 +0800)]
avcodec/vc1_mc: optimize get_chroma_mv, and add get_luma_mv

Test results:

before:
  fate-suite/vc1/SA10091.vc1: 1062 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4089 runs, 7 skips
  fate-suite/vc1/SA10143.vc1: 1112 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 991 decicycles in ff_vc1_mc_4mv_chroma get mv, 8192 runs, 0 skips

after:
  fate-suite/vc1/SA10091.vc1: 940 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA10143.vc1: 786 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 876 decicycles in ff_vc1_mc_4mv_chroma get mv, 8189 runs, 3 skips

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking in qpel, chroma_4m...
Michael Niedermayer [Sun, 8 Mar 2015 00:45:53 +0000 (01:45 +0100)]
avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking in qpel, chroma_4mv and 8x8

No testcase available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking
Michael Niedermayer [Sun, 8 Mar 2015 00:27:56 +0000 (01:27 +0100)]
avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking

Fixes Ticket4299

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opusdec: Fix delayed sample value
Michael Niedermayer [Sat, 7 Mar 2015 14:34:19 +0000 (15:34 +0100)]
avcodec/opusdec: Fix delayed sample value

Fixes out of array access
Fixes: ffmpeg_opus_crash1.ogg

This solution is likely not optimal in terms of error concealment but
its simple and fixes the out of array access.

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opusdec: Clear out pointers per packet
Michael Niedermayer [Sat, 7 Mar 2015 14:11:39 +0000 (15:11 +0100)]
avcodec/opusdec: Clear out pointers per packet

This is safer than to assume that all error pathes cleared them and
nothing will use uncleared pointers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Align YUV411 by as much as the other YUV variants
Michael Niedermayer [Sat, 7 Mar 2015 13:30:34 +0000 (14:30 +0100)]
avcodec/utils: Align YUV411 by as much as the other YUV variants

Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_mc: change the type of s_rndtblfield to uint8_t
zhaoxiu.zeng [Sat, 7 Mar 2015 14:47:18 +0000 (22:47 +0800)]
avcodec/vc1_mc: change the type of s_rndtblfield to uint8_t

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_mc: Simplify v_edge_pos and src_y correction when fieldmv is true
zhaoxiu.zeng [Sat, 7 Mar 2015 14:45:36 +0000 (22:45 +0800)]
avcodec/vc1_mc: Simplify v_edge_pos and src_y correction when fieldmv is true

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/golomb: cleanup
Zeng Zhaoxiu [Sat, 7 Mar 2015 15:42:05 +0000 (23:42 +0800)]
avcodec/golomb: cleanup

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangeLog: Remove the redundant VP9 RTP entry
Xiangyu Liu [Fri, 6 Mar 2015 01:42:04 +0000 (09:42 +0800)]
ChangeLog: Remove the redundant VP9 RTP entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b77e335e441040a40fc6156b8e4a134745d10233'
Michael Niedermayer [Sat, 7 Mar 2015 18:40:54 +0000 (19:40 +0100)]
Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'

* commit 'b77e335e441040a40fc6156b8e4a134745d10233':
  configure: Move the .object_arch check to the right place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'
Michael Niedermayer [Sat, 7 Mar 2015 18:30:46 +0000 (19:30 +0100)]
Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'

* commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73':
  arm: Suppress tags about used cpu arch and extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Move the .object_arch check to the right place
Martin Storsjö [Thu, 5 Mar 2015 21:38:00 +0000 (23:38 +0200)]
configure: Move the .object_arch check to the right place

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/vc1_mc: remove useless variables
Zeng Zhaoxiu [Sat, 7 Mar 2015 08:24:42 +0000 (16:24 +0800)]
avcodec/vc1_mc: remove useless variables

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarm: Suppress tags about used cpu arch and extensions
Martin Storsjö [Tue, 17 Feb 2015 22:40:06 +0000 (00:40 +0200)]
arm: Suppress tags about used cpu arch and extensions

When all the codepaths using manually set .arch/.fpu code is
behind runtime detection, the elf attributes should be suppressed.

This allows tools to know that the final built binary doesn't
strictly require these extensions.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavfilter: Add FFT domain filter.
Arwa Arif [Tue, 24 Feb 2015 06:47:30 +0000 (12:17 +0530)]
avfilter: Add FFT domain filter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/asmdefs: change include guard to read AVUTIL_ instead of AVCODEC_
James Cowgill [Sat, 7 Mar 2015 10:15:19 +0000 (10:15 +0000)]
mips/asmdefs: change include guard to read AVUTIL_ instead of AVCODEC_

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit"
Michael Niedermayer [Sat, 7 Mar 2015 08:59:27 +0000 (09:59 +0100)]
Revert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit"

Fixed build with opencl enabled
Found-by: WJ Liu
This reverts commit 0f2359b86926ed33da4bd64ca76d84d03d5ad380.

4 years agovp9: fix segmentation map retention with threading enabled.
Ronald S. Bultje [Sat, 7 Mar 2015 02:07:54 +0000 (21:07 -0500)]
vp9: fix segmentation map retention with threading enabled.

Fixes ticket 4359.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_colormatrix: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sat, 7 Mar 2015 01:44:04 +0000 (02:44 +0100)]
avfilter/vf_colormatrix: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/f_perms: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sat, 7 Mar 2015 01:44:04 +0000 (02:44 +0100)]
avfilter/f_perms: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/avf_showwaves: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Sat, 7 Mar 2015 01:44:04 +0000 (02:44 +0100)]
avfilter/avf_showwaves: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'
Michael Niedermayer [Sat, 7 Mar 2015 00:16:17 +0000 (01:16 +0100)]
Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'

* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
  doc: Add -list_formats all example for video4linux2

Conflicts:
doc/indevs.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Add -list_formats all example for video4linux2
Jonas Lindgren [Fri, 6 Mar 2015 22:02:34 +0000 (23:02 +0100)]
doc: Add -list_formats all example for video4linux2

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoconfigure: Make compilable with VS2015 (missing hunk)
Peter Tissen [Fri, 6 Mar 2015 18:39:27 +0000 (19:39 +0100)]
configure: Make compilable with VS2015 (missing hunk)

This hunk was missing in the github pull request when i downloaded it,
but is needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Make compilable with VS2015
Peter Tissen [Fri, 6 Mar 2015 18:39:27 +0000 (19:39 +0100)]
configure: Make compilable with VS2015

So Visual Studio 2015 has some breaking changes regarding the C
runtime. In short, they made C99 compatable runtime.
Refer to http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx

Made-Seriously-Happy: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix spelling errors
Andreas Cadhalpun [Fri, 6 Mar 2015 19:26:32 +0000 (20:26 +0100)]
fix spelling errors

 opttimizations -> optimizations
 grabing        -> grabbing
 many resource  -> many resources
 isnt           -> isn't
 silcense       -> silence

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
Michael Niedermayer [Fri, 6 Mar 2015 19:54:41 +0000 (20:54 +0100)]
Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'

* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
libavformat/movenc.c

See: 95165f7c1b533c121b890fa1e82e8ed596cfc108
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/samidec: make sure to properly restore parsing context after a tag
Clément Bœsch [Fri, 6 Mar 2015 19:39:45 +0000 (20:39 +0100)]
avcodec/samidec: make sure to properly restore parsing context after a tag

4 years agoChangelog: Add back "version next"
Michael Niedermayer [Fri, 6 Mar 2015 18:34:05 +0000 (19:34 +0100)]
Changelog: Add back "version next"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd 2.6 to maintained releases n2.7-dev
Michael Niedermayer [Fri, 6 Mar 2015 16:42:36 +0000 (17:42 +0100)]
Add 2.6 to maintained releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Fill in the xx
Michael Niedermayer [Fri, 6 Mar 2015 15:35:03 +0000 (16:35 +0100)]
doc/APIchanges: Fill in the xx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Add 2.6 cut marker
Michael Niedermayer [Fri, 6 Mar 2015 15:20:52 +0000 (16:20 +0100)]
doc/APIchanges: Add 2.6 cut marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog: rename next to 2.6
Michael Niedermayer [Fri, 6 Mar 2015 15:19:58 +0000 (16:19 +0100)]
Changelog: rename next to 2.6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opencl: is_compiled flag not being cleared in av_opencl_uninit
Srikanth G [Thu, 5 Mar 2015 00:48:54 +0000 (18:48 -0600)]
avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit

When OpenCL kernels are compiled, is_compiled flag is being set for each
kernel. But, in opencl uninit, this flag is not being cleared.
This causes an error when an OpenCL kernel is tried on different OpenCL
devices on same platform.

Here is the patch with a fix

Reviewed-by; Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Keep writing zero-entry stts atoms as intended
Martin Storsjö [Fri, 6 Mar 2015 10:27:14 +0000 (12:27 +0200)]
movenc: Keep writing zero-entry stts atoms as intended

a876585215 had the unintended side effect of returning AVERROR(ENOMEM)
when track->entry is zero, while the code intentionally wants to
continue in that case.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agochangelog: add mips 64-bit port
James Cowgill [Thu, 5 Mar 2015 17:40:16 +0000 (17:40 +0000)]
changelog: add mips 64-bit port

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips: port optimizations to mips n64
James Cowgill [Thu, 5 Mar 2015 17:40:15 +0000 (17:40 +0000)]
mips: port optimizations to mips n64

This mainly consists of replacing all the pointer arithmatic 'addiu'
instructions with PTR_ADDIU which will handle the differences in pointer
sizes when compiled on 64 bit mips systems.

The header asmdefs.h contains the PTR_ macros which expend to the correct mips
instructions to manipulate registers containing pointers.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure, mips: remove MIPS32R2, merging it with MIPSFPU
James Cowgill [Thu, 5 Mar 2015 17:40:14 +0000 (17:40 +0000)]
configure, mips: remove MIPS32R2, merging it with MIPSFPU

There are no independant uses of mips32r2 instructions except for the
FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I
am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway.

Since these fpu instructions are available on mips64 (non-r2), enable them
there as well.

Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to
HAVE_MIPSFPU anyway).

mips32r2 is left in the list of options form compatability so that using
--disable-mips32r2 doesn't break anything.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/aacdec: remove uses of mips32r2 specific ext instructions
James Cowgill [Thu, 5 Mar 2015 17:40:13 +0000 (17:40 +0000)]
mips/aacdec: remove uses of mips32r2 specific ext instructions

Removing these removes the dependency of this code on mips32r2 which would
allow it to be used on processors which have FPU instructions, but not r2
instructions (like the mips64el debian port for instance).

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAAC: Add support for 7350Hz sampling rates, no error on too hight bitrate.
Claudio Freire [Fri, 6 Mar 2015 07:05:32 +0000 (04:05 -0300)]
AAC: Add support for 7350Hz sampling rates, no error on too hight bitrate.

Instead, warn that bitrate will be clamped down to the maximum allowed.

Patch is mostly work of Kamendo2 in issue #2686, quite tested within that issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'
Michael Niedermayer [Fri, 6 Mar 2015 11:13:05 +0000 (12:13 +0100)]
Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

* commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b':
  dashenc: Update extradata for mov muxer

See: f5668e614bdccc19a3b3e3d3d67f7c7778526908
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'
Michael Niedermayer [Fri, 6 Mar 2015 10:56:18 +0000 (11:56 +0100)]
Merge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'

* commit '6cf7f30655e95e27fd0394b5a80970d6f9517015':
  dashenc: Simplify code by using a local variable

See: f5668e614bdccc19a3b3e3d3d67f7c7778526908
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'
Michael Niedermayer [Fri, 6 Mar 2015 10:31:19 +0000 (11:31 +0100)]
Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Remove 1.2 from the maintained releases
Michael Niedermayer [Fri, 13 Feb 2015 16:16:26 +0000 (17:16 +0100)]
MAINTAINERS: Remove 1.2 from the maintained releases

The only distribution which still uses it according to
https://trac.ffmpeg.org/wiki/Downstreams is "gentoo stable", but
http://packages.gentoo.org/package/media-video/ffmpeg lists stable as shipping 1.2.6 which is 6 point
releases behind. Also gentoos ffmpeg maintainer stated "don't worry about gentoo: we're in the process
of moving to latest 2.2 for stable."

CC: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodashenc: Update extradata for mov muxer
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
dashenc: Update extradata for mov muxer

The mov muxer already supports picking up extradata that wasn't
present during the avformat_write_header call - we just need to
propagate it. Since the dash muxer uses delay_moov, we have time
up until the first segment is written to get extradata filled in.

Also update the codec description string when the extradata becomes
available.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodashenc: Simplify code by using a local variable
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
dashenc: Simplify code by using a local variable

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibopenh264enc: Add support for building with OpenH264 1.4
Martin Storsjö [Thu, 5 Mar 2015 11:57:44 +0000 (13:57 +0200)]
libopenh264enc: Add support for building with OpenH264 1.4

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agowebp: ensure that each transform is only used once
Andreas Cadhalpun [Thu, 5 Mar 2015 21:48:28 +0000 (22:48 +0100)]
webp: ensure that each transform is only used once

According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".

If a transform is more than once this can lead to memory
corruption.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '88b160a457e491cb9e014630ef5387ad3500258e'
Michael Niedermayer [Fri, 6 Mar 2015 00:04:19 +0000 (01:04 +0100)]
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/avfoundation: Add support for 24 and 32bit integer input.
John Robinson [Fri, 6 Mar 2015 00:10:16 +0000 (01:10 +0100)]
lavd/avfoundation: Add support for 24 and 32bit integer input.

Tested on Mac Mini soundflower and built-in line input.

Reviewed-by: Thilo Borgmann
4 years agolavd/avfoundation: Add support for 16bit integer input.
Carl Eugen Hoyos [Fri, 6 Mar 2015 00:06:57 +0000 (01:06 +0100)]
lavd/avfoundation: Add support for 16bit integer input.

Reviewed-by: Thilo Borgmann
4 years agohls: detect SAMPLE-AES encryption
selsta [Thu, 5 Mar 2015 18:49:57 +0000 (19:49 +0100)]
hls: detect SAMPLE-AES encryption

SAMPLE-AES encryption is not commonly used yet, but without this patch
ffmpeg is thinking that the hls segments are not encrypted which
produces broken files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDrop outdated RELEASE_NOTES
Clément Bœsch [Thu, 5 Mar 2015 21:25:10 +0000 (22:25 +0100)]
Drop outdated RELEASE_NOTES

A new RELEASE_NOTES specific to the release will be added.

4 years agoMerge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
Michael Niedermayer [Thu, 5 Mar 2015 19:55:56 +0000 (20:55 +0100)]
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'

* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
  h264: remove a now redundant error check

Conflicts:
libavcodec/h264_slice.c

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c73c3c34fe72bb06966450207917ce902146b172'
Michael Niedermayer [Thu, 5 Mar 2015 19:32:18 +0000 (20:32 +0100)]
Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'
Michael Niedermayer [Thu, 5 Mar 2015 19:24:27 +0000 (20:24 +0100)]
Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'

* commit 'bb4edddd9389cc1601db618ed3c1375b62628d04':
  rmenc: limit packet size

Conflicts:
libavformat/rmenc.c

See: 08728f400b8367dc8c983036cb2eff3a2891322b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb'
Michael Niedermayer [Thu, 5 Mar 2015 18:51:43 +0000 (19:51 +0100)]
Merge commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb'

* commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb':
  webp: validate the distance prefix code

See: 5de2dab12b951b2fe121eb18503accfc91cd1565
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'
Michael Niedermayer [Thu, 5 Mar 2015 18:41:10 +0000 (19:41 +0100)]
Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'

* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
libavcodec/rv10enc.c

See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avidec: Check avio_read() return before using the results for meta-data
Michael Niedermayer [Thu, 5 Mar 2015 18:31:56 +0000 (19:31 +0100)]
avformat/avidec: Check avio_read() return before using the results for meta-data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: Return more meaningful error codes
Himangi Saraogi [Mon, 23 Feb 2015 04:21:16 +0000 (09:51 +0530)]
avfilter: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavformat/avidec: initialize header array
Michael Niedermayer [Thu, 5 Mar 2015 17:29:50 +0000 (18:29 +0100)]
avformat/avidec: initialize header array

Fixes use of uninitialized memory in case read fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: remove a now redundant error check
Anton Khirnov [Tue, 27 Jan 2015 11:31:24 +0000 (12:31 +0100)]
h264: remove a now redundant error check

It was only relevant when data partitioning was in use.

4 years agoavfilter/vf_paletteuse: indent fix after 7ccc5848
Clément Bœsch [Thu, 5 Mar 2015 15:04:20 +0000 (16:04 +0100)]
avfilter/vf_paletteuse: indent fix after 7ccc5848

4 years agoavfilter/vf_paletteuse: Use int where AVERROR can be returned
Michael Niedermayer [Thu, 5 Mar 2015 14:52:00 +0000 (15:52 +0100)]
avfilter/vf_paletteuse: Use int where AVERROR can be returned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/adxdec: set avctx->channels in adx_read_header
Andreas Cadhalpun [Thu, 26 Feb 2015 00:06:57 +0000 (01:06 +0100)]
avformat/adxdec: set avctx->channels in adx_read_header

It is used in adx_read_packet, which currently depends on the
decoder/parser setting this value between reading the file header and
demuxing the first packet.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agormenc: limit packet size
Andreas Cadhalpun [Mon, 2 Mar 2015 15:52:26 +0000 (16:52 +0100)]
rmenc: limit packet size

The chunk size is limited to UINT16_MAX (written by avio_wb16), so make
sure that the packet size is not too large.

Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agowebp: validate the distance prefix code
Andreas Cadhalpun [Mon, 2 Mar 2015 19:47:57 +0000 (20:47 +0100)]
webp: validate the distance prefix code

According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.

If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agorv10: check size of s->mb_width * s->mb_height
Andreas Cadhalpun [Tue, 3 Mar 2015 20:31:15 +0000 (21:31 +0100)]
rv10: check size of s->mb_width * s->mb_height

If it doesn't fit into 12 bits it triggers an assertion.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavutil/opt: Do not print inf in selftest
Michael Niedermayer [Thu, 5 Mar 2015 12:50:22 +0000 (13:50 +0100)]
avutil/opt: Do not print inf in selftest

This fixes fate failures on windows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate-aac-aref-encode: increase FUZZ to 5, needed for ppc64be
Michael Niedermayer [Thu, 5 Mar 2015 12:12:48 +0000 (13:12 +0100)]
fate-aac-aref-encode: increase FUZZ to 5, needed for ppc64be

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/float_dsp: fix a bug in vector_fmul_window_mips
Nedeljko Babic [Thu, 5 Mar 2015 11:23:59 +0000 (12:23 +0100)]
mips/float_dsp: fix a bug in vector_fmul_window_mips

Loop was unrolled eight times although in heder there is assumption
that len is multiple of 4.
This is fixed, and assembly code is rewritten to be more optimal and
to simplify clobber list.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Add support for writing 'gama' atom to QuickTime .mov files.
Kevin Wheatley [Thu, 5 Mar 2015 10:40:13 +0000 (10:40 +0000)]
avformat/movenc: Add support for writing 'gama' atom to QuickTime .mov files.

As this is depricated it should not be on by default, it is only
supported for MOV containers, depends on avpriv_get_gamma_from_trc()

Enable by:

-movflags +write_gama

This will use the color_trc to supply a gamma value, if desired an
explicit value may be supplied using the -mov_gamma option supplying
a suitable floating point value, values <=1e-6 will not be written.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: Extract gamma determination from PNG encoder for future use. Adds private...
Kevin Wheatley [Thu, 5 Mar 2015 10:37:51 +0000 (10:37 +0000)]
avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/protocols/tcp: fix units of listen_timeout option value, from microseconds to...
Stefano Sabatini [Thu, 5 Mar 2015 11:05:17 +0000 (12:05 +0100)]
doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds

s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.

The unit was incorrectly set in 1b4da43ce02452843a1e9bb976da1a39e18a945c.

4 years agoavformat/mxfdec: Detect XYZ pixel format for digital cinema files
Vilius Grigaliūnas [Wed, 4 Mar 2015 22:36:50 +0000 (00:36 +0200)]
avformat/mxfdec: Detect XYZ pixel format for digital cinema files

While the native jpeg2000 decoder can determine pixel format correctly
from the codestream, libopenjpeg wrapper cannot. To make sure that
the output is correct when using libopenjpeg to decode digital
cinema files, we do detection from the metadata included in the MXF
wrapper.

If the container has "JPEG 2000 Coding Parameters" metadata element
with Rsiz value set to one of digital cinema profiles, we can safely
assume that the given input file is DCI compliant, therefore the
pixel format should be XYZ.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dashenc: Update extradata for mov muxer
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
avformat/dashenc: Update extradata for mov muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>