ffmpeg.git
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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
6 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
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 years agoMerge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'
Michael Niedermayer [Thu, 5 Mar 2015 09:10:23 +0000 (10:10 +0100)]
Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'

* commit '9c09fbd8053292267cdc4b542913ceced43ea3a9':
  rtpdec: experimental VP9 depacketizer (draft 0)

Conflicts:
libavformat/rtpdec.c
libavformat/rtpdec_vp9.c
libavformat/version.h

See: e4a6486c17dd90b338450ac7e151ffbf5370948a
See: f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See: 629a03a9128bd2e51286258e12183b1d06f509a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec: experimental VP9 depacketizer (draft 0)
Thomas Volkert [Tue, 3 Mar 2015 23:33:31 +0000 (00:33 +0100)]
rtpdec: experimental VP9 depacketizer (draft 0)

The code was tested with live555 server.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'
Michael Niedermayer [Thu, 5 Mar 2015 01:16:50 +0000 (02:16 +0100)]
Merge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'

* commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6':
  pcxenc: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'
Michael Niedermayer [Thu, 5 Mar 2015 00:40:03 +0000 (01:40 +0100)]
Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'

* commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac':
  rdt: Use a separate variable to clarify the different value namespaces

Conflicts:
libavformat/rdt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'
Michael Niedermayer [Thu, 5 Mar 2015 00:19:52 +0000 (01:19 +0100)]
Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'

* commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b':
  rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15621cbbe4ed88409ef40257afaf239487964e98'
Michael Niedermayer [Thu, 5 Mar 2015 00:12:13 +0000 (01:12 +0100)]
Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'

* commit '15621cbbe4ed88409ef40257afaf239487964e98':
  rtpdec_asf: Don't set RTP_FLAG_KEY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avformat: improve the text about headerless formats in avformat_flush()
Reimar Döffinger [Wed, 4 Mar 2015 22:13:35 +0000 (23:13 +0100)]
avformat/avformat: improve the text about headerless formats in avformat_flush()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: add avformat_flush()
wm4 [Tue, 30 Sep 2014 16:46:49 +0000 (18:46 +0200)]
avformat: add avformat_flush()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAllow AVFoundation compilation on OS X 10.7.
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:54:10 +0000 (23:54 +0100)]
Allow AVFoundation compilation on OS X 10.7.

Fixes ticket #4238.

Reviewed-by: Thilo Borgmann
6 years agolavf/mxf: Support ProRes decoding.
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:48:41 +0000 (23:48 +0100)]
lavf/mxf: Support ProRes decoding.

Fixes ticket #4349.

6 years agopcxenc: Return more meaningful error codes
Himangi Saraogi [Wed, 4 Mar 2015 15:44:04 +0000 (21:14 +0530)]
pcxenc: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agordt: Use a separate variable to clarify the different value namespaces
Martin Storsjö [Wed, 4 Mar 2015 08:00:08 +0000 (10:00 +0200)]
rdt: Use a separate variable to clarify the different value namespaces

The original flags variable contains rtpdec flags, while the
rmflags variable contains RM flag bits which have a completely
different definition.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec_qt: Use a local variable instead of RTP_FLAG_KEY
Martin Storsjö [Wed, 4 Mar 2015 07:57:02 +0000 (09:57 +0200)]
rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY

The only case where RTP_FLAG_KEY actually is needed is
in RDT, where such a flag needs to be passed via the
rtpdec parse function's flags parameter.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec_asf: Don't set RTP_FLAG_KEY
Martin Storsjö [Wed, 4 Mar 2015 07:52:33 +0000 (09:52 +0200)]
rtpdec_asf: Don't set RTP_FLAG_KEY

Nothing in the framework nor in the rest of the depacketizer actually
uses this flag - the chained demuxer sets the keyframe flag properly on
demuxed packets already.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/movenc: mark write_colr as experimental
Michael Niedermayer [Wed, 4 Mar 2015 21:36:23 +0000 (22:36 +0100)]
avformat/movenc: mark write_colr as experimental

This way the flag can be flipped to a nowrite_colr, if people prefer that

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: update AQ options help for x264 build 144
Peter Cordes [Thu, 29 Jan 2015 21:24:45 +0000 (17:24 -0400)]
libx264: update AQ options help for x264 build 144

Regular autovariance is no longer "experimental", and a version of it with
bias towards dark scenes is now in mainline x264.

Signed-off-by: Peter Cordes <peter@cordes.ca>
6 years agopixelutils: Comment on (lack of) sad_8x8_sse2
Peter Cordes [Thu, 29 Jan 2015 21:20:27 +0000 (17:20 -0400)]
pixelutils: Comment on (lack of) sad_8x8_sse2

Signed-off-by: Peter Cordes <peter@cordes.ca>
6 years agopixelutils: indent comments in pixdesc.h to be clearer
Peter Cordes [Thu, 29 Jan 2015 21:19:39 +0000 (17:19 -0400)]
pixelutils: indent comments in pixdesc.h to be clearer

Signed-off-by: Peter Cordes <peter@cordes.ca>
6 years agovf_showinfo: minimum widths for some early fields
Peter Cordes [Thu, 15 Jan 2015 03:06:51 +0000 (23:06 -0400)]
vf_showinfo: minimum widths for some early fields

Depending on FPS, the pts_time string often changes length:
... pts_time:36.1 ...
... pts_time:36.1333 ...
etc.

 The length changes make the output bounce around horribly, making it
hard to scan down a column farther right than pts_time.

The solution is to set minimum widths for n, pts, pts_time, and pos.
This patch doesn't touch any of the fields in mean / stddev.

 The widths aren't intended to be wide enough that they're never
exceeded, but you'll see only an occasional ripple to a new alignment,
rather than bouncing.  (Some fields, like pos, increase monotonically,
which is why I left the minimum width for the field be smaller than it
often gets to.)

Signed-off-by: Peter Cordes <peter@cordes.ca>
6 years agoMerge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'
Michael Niedermayer [Wed, 4 Mar 2015 19:42:33 +0000 (20:42 +0100)]
Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

* commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5':
  flv: Validate and reject unsupported codecs

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'
Michael Niedermayer [Wed, 4 Mar 2015 18:48:28 +0000 (19:48 +0100)]
Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'

* commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15':
  aac: Relax reserved_bit validation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
Michael Niedermayer [Wed, 4 Mar 2015 18:24:12 +0000 (19:24 +0100)]
Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
  dca: Move syncword definitions to a separate header

Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c

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