summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'James Almer2017-10-03
|\ | | | | | | | | | | | | * commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4': fate: Rename WMV8_DRM decoder tests to WMV3_DRM Merged-by: James Almer <jamrial@gmail.com>
| * fate: Rename WMV8_DRM decoder tests to WMV3_DRMDiego Biurrun2017-02-28
| | | | | | | | The codec used in those files is WMV3/WMV9, not WMV2/WMV8.
* | Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '79331df362fb05a0d04ca9489c87e5b80077a3f4': rtsp: Lazily set up the pollfd array once Merged-by: James Almer <jamrial@gmail.com>
| * rtsp: Lazily set up the pollfd array onceLuca Barbato2017-02-28
| |
* | Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'James Almer2017-10-03
|\| | | | | | | | | | | | | | | | | * commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d': nvenc: Fix the preset mapping list This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * nvenc: Fix the preset mapping listBen Chang2017-02-28
| | | | | | | | | | | | | | | | | | | | | | | | The map is a sparse array and does not need a empty element to terminate it. The empty element is stored after the last one inserted in the list, overwriting whichever element was next with zeros. Bug-Id: 1029 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc': fate: Make null comparison method more useful Merged-by: James Almer <jamrial@gmail.com>
| * fate: Make null comparison method more usefulDiego Biurrun2017-02-27
| | | | | | | | This allows dropping /dev/null as reference value when no output is generated.
* | Merge commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb': build: Drop DOC_ prefix from EXAMPLES-related variables Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop DOC_ prefix from EXAMPLES-related variablesDiego Biurrun2017-02-27
| |
* | Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '5263f464db5f2df74ddf712f6d1221b24475fa8e': rtsp: Lazily allocate the pollfd array Merged-by: James Almer <jamrial@gmail.com>
| * rtsp: Lazily allocate the pollfd arrayLuca Barbato2017-02-27
| | | | | | | | And use av_malloc_array.
* | Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86': rtsp: Move the pollfd setup out of the for loop Merged-by: James Almer <jamrial@gmail.com>
| * rtsp: Move the pollfd setup out of the for loopLuca Barbato2017-02-27
| |
* | Merge commit '150e99d694f33ab9ad678834964909aa315d14a1'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '150e99d694f33ab9ad678834964909aa315d14a1': rtsp: Factor out packet reading Merged-by: James Almer <jamrial@gmail.com>
| * rtsp: Factor out packet readingLuca Barbato2017-02-27
| |
* | Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7': Use modern avconv syntax for codec selection in documentation and tests Merged-by: James Almer <jamrial@gmail.com>
| * Use modern avconv syntax for codec selection in documentation and testsDiego Biurrun2017-02-27
| |
* | avformat/mp3dec: Fix definition of MIDDLE_BITSIngo Brückl2017-10-04
| | | | | | | | | | | | | | The number of bits from bit #m to #n is n - m plus 1. Signed-off-by: Ingo Brückl <ib@wupperonline.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dxv: Check for end of input in dxv_decompress_dxt5()Michael Niedermayer2017-10-04
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 3291/clusterfuzz-testcase-4630024655208448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/truemotion2: Fix integer overflows in tm2_high_chroma()Michael Niedermayer2017-10-04
| | | | | | | | | | | | | | | | Fixes: runtime error: signed integer overflow: -1408475220 + -1408475220 cannot be represented in type 'int' Fixes: 3336/clusterfuzz-testcase-minimized-5656839179993088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aacdec_template: Clear tns present flag on errorMichael Niedermayer2017-10-04
| | | | | | | | | | | | | | Fixes: 3444/clusterfuzz-testcase-minimized-6270352105668608 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mpegdec: fix redundant dummy frames issue of interlaced clipsZhong Li2017-10-04
| | | | | | | | | | | | | | | | | | It is to fix https://trac.ffmpeg.org/ticket/6677. Actucally it is a regression of commit 99e07a4453732058df90885f80b3db3b4f37cb3c which always inserts a dummy frame when decode the first key field picture. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'da8093f712d625db7ce4a2526fb52994e01921ec'James Almer2017-10-03
|\| | | | | | | | | | | | | | | | | * commit 'da8093f712d625db7ce4a2526fb52994e01921ec': fate: Use bitexact optimizations in the svq3-2 test This commit is a noop, see b591329c3afe445c45eaecadd5fe3b80a837ee2f Merged-by: James Almer <jamrial@gmail.com>
| * fate: Use bitexact optimizations in the svq3-2 testDiego Biurrun2017-02-27
| | | | | | | | | | This fixes the test with mmxext disabled because the current reference frame hashes correspond to the non-bitexact mmxext optimizations.
* | Merge commit '984736dd9e5b50987a5910e22495304e4a6d975c'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '984736dd9e5b50987a5910e22495304e4a6d975c': lavc: make sure not to return EAGAIN from codecs Merged-by: James Almer <jamrial@gmail.com>
| * lavc: make sure not to return EAGAIN from codecsAnton Khirnov2017-02-25
| | | | | | | | | | | | This error is treated specially by the API. CC: libav-stable@libav.org
* | Merge commit '4cc0227040adb9efc63be6a5765e3214f5c6f662'James Almer2017-10-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4cc0227040adb9efc63be6a5765e3214f5c6f662': apetag: account for header size if present when returning the start position apetag: fix flag value to signal footer presence This commit is a noop, see e8d6fef3161f35878f8e0abf9d27d2c45a5d40b6 84d874a680ff647bc84de44967b638f246a8b832 Merged-by: James Almer <jamrial@gmail.com>
| * apetag: account for header size if present when returning the start positionJames Almer2017-02-25
| | | | | | | | | | | | | | | | | | | | | | | | The size field in the header/footer accounts for the entire APE tag structure except the 32 bytes from header, for compatibility with APEv1. Signed-off-by: James Almer <jamrial@gmail.com> CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * apetag: fix flag value to signal footer presenceJames Almer2017-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the spec[1], a value of 0 means the footer is present and a value of 1 means it's absent, the exact opposite of header presence flag where 1 means present and 0 absent. The reason for this is compatibility with APEv1 tags, where there's no header, footer presence was mandatory for all files, and the flags field was a zeroed reserved field. [1] http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags Signed-off-by: James Almer <jamrial@gmail.com> CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7': svq3: fix the slice size check Merged-by: James Almer <jamrial@gmail.com>
| * svq3: fix the slice size checkAnton Khirnov2017-02-25
| | | | | | | | | | | | | | | | | | Currently it incorrectly compares bits with bytes. Also, move the check right before where it's relevant, so that the correct number of remaining bits is used. CC: libav-stable@libav.org
* | doc: Add mailing list FAQLou Logan2017-10-03
| | | | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Reviewed-by: Kieran O Leary <kieran.o.leary@gmail.com> Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* | Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit 'cd7a2e1502f174c725c0de82711d2c7649057574': asfdec: fix reading files larger than 2GB Merged-by: James Almer <jamrial@gmail.com>
| * asfdec: fix reading files larger than 2GBJohn Stebbins2017-02-24
| | | | | | | | avio_skip returns file position and overflows int
* | Merge commit '248dc5c1646dcdd96fe79761105c4ae889e711fd'James Almer2017-10-03
|\| | | | | | | | | | | | | * commit '248dc5c1646dcdd96fe79761105c4ae889e711fd': h264dec: fix dropped initial SEI recovery point Merged-by: James Almer <jamrial@gmail.com>
| * h264dec: fix dropped initial SEI recovery pointJohn Stebbins2017-02-24
| |
* | libavcodec/blockdsp : add AVX versionMartin Vignali2017-10-03
| | | | | | | | | | | | | | Also modify the required alignment, to 32 instead of 16 for several codecs Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/mxfdec: Search all components of material track for source package.Carl Eugen Hoyos2017-10-03
| | | | | | | | | | | | Fixes ticket #5925. Reviewed-by: Marton
* | fate: Add a test for latm-in-dvb auto-detection, ticket #6657.Carl Eugen Hoyos2017-10-03
| |
* | avcodec/proresdec2: Use LAST_SKIP_BITS where possibleMichael Niedermayer2017-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/proresdec2: SKIP_BITS() does not work with len=32Michael Niedermayer2017-10-03
| | | | | | | | | | | | | | | | Fixes: invalid shift Fixes: 3482/clusterfuzz-testcase-minimized-5446915875405824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/hevcdsp_template: Fix undefined shiftMichael Niedermayer2017-10-03
| | | | | | | | | | | | | | | | Fixes: runtime error: left shift of negative value -255 Fixes: 3373/clusterfuzz-testcase-minimized-5604083912146944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/encode: do proper cleanup on failureJames Almer2017-10-03
| | | | | | | | | | | | Fixes the last remaining memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22. Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/mxfenc: Fix labels for IEC PAL DV 420Michael Niedermayer2017-10-03
| |
* | avformat/mxfenc: Add IEC DV25Michael Niedermayer2017-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | build: fix compilation of tools with OpenCL enabledJames Almer2017-10-03
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | fate: disable fate-svq3-2James Almer2017-10-02
| | | | | | | | | | | | | | | | The first frame changes depending on --enable-memory-poisoning being used to configure ffmpeg or not, even if requesting bitexact decoding. Disable the test until this is fixed. Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/encode: free non-referenced packets' side data in the old encode API ↵James Almer2017-10-02
| | | | | | | | | | | | functions Fixes memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22.
* | Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'James Almer2017-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e4d4efc67e154fdffd65964a7cfeef740320827': fate: Add another SVQ3 test to increase coverage Also included a fix from da8093f712d625db7ce4a2526fb52994e01921ec. The demuxer option "-ignore_editlist 1 " is temporarily added to the test as well, to workaround a regression in the edit list mov parsing code. Merged-by: James Almer <jamrial@gmail.com>