aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: fix typosLou Logan2015-01-075-6/+6
| | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* avcodec/dvdsubdec: error on bitmaps with size 0wm42015-01-081-0/+3
| | | | | | | Attemtping to decode them could lead to invalid writes with some fuzzed samples. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'Michael Niedermayer2015-01-081-4/+10
|\ | | | | | | | | | | | | | | | | | | | | * commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c': xsub: Support DXSA subtitles Conflicts: libavcodec/xsubdec.c See: d6f910ea47255b519e0b71c33d74c409a29ab3db Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xsub: Support DXSA subtitlesAlexandre Colucci2015-01-071-4/+11
| | | | | | | | | | | | | | | | These have a DXSA tag and contain alpha in addition to color values for palette. Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'Michael Niedermayer2015-01-071-1/+0
|\| | | | | | | | | | | | | * commit '01168bf1405ddbf671f1074a927b951b8777adbb': mpeg: Remove unused field Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Remove unused fieldLuca Barbato2015-01-071-1/+0
| |
* | avformat/segment: Clear contexts after deallocationMichael Niedermayer2015-01-071-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b3f04657368a32a9903406395f865e230b1de348'Michael Niedermayer2015-01-071-7/+20
|\| | | | | | | | | | | | | | | | | | | * commit 'b3f04657368a32a9903406395f865e230b1de348': segment: Fix the failure paths Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Fix the failure pathsLuca Barbato2015-01-071-12/+20
| | | | | | | | | | | | | | | | | | A failure in segment_end() or segment_start() would lead to freeing a dangling pointer and in general further calls to seg_write_packet() or to seg_write_trailer() would have the same faulty behaviour. CC: libav-stable@libav.org Reported-By: luodalongde@gmail.com
* | avcodec/aic: Use av_malloc_arrayMichael Niedermayer2015-01-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Check for av_realloc_array() failureMichael Niedermayer2015-01-071-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Use av_realloc_array()Michael Niedermayer2015-01-071-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: fix potential integer overflowMichael Niedermayer2015-01-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dvbsub: remove unused variableMichael Niedermayer2015-01-071-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12: Try to fetch pts/dts from both the packet associated with ↵Michael Niedermayer2015-01-071-1/+1
| | | | | | | | | | | | the picture start code as well as earlier start codes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/parser: add fuzzy mode to ff_fetch_timestamp()Michael Niedermayer2015-01-073-12/+17
| | | | | | | | | | | | This will be needed for the following timestamp fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/allcodecs: prefer x264 over openh264 if both are availableMichael Niedermayer2015-01-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'Michael Niedermayer2015-01-076-1/+236
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4': libavcodec: Add an OpenH264 encoder wrapper Conflicts: Changelog configure libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: Add an OpenH264 encoder wrapperMartin Storsjö2015-01-066-1/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to existing, common opensource H264 encoders, this can be useful since it has got a different license (BSD instead of GPL). Performance- and qualitywise it is comparable to x264 in ultrafast mode. Hooking it up as an encoder in libavcodec also simplifies comparing it against other common encoders. This requires OpenH264 1.3 or newer. Since the OpenH264 API and ABI changes frequently, only releases are supported. To take advantage of the OpenH264 patent offer, the OpenH264 library must not be redistributed, but downloaded at runtime at the end-user's system. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'Michael Niedermayer2015-01-071-1/+1
|\| | | | | | | | | | | | | * commit '2a1500fb552364488cfbee3e29e296788a3a6bdd': movenc: Fix a typo in a comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Fix a typo in a commentMartin Storsjö2015-01-061-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'Michael Niedermayer2015-01-071-1/+1
|\| | | | | | | | | | | | | * commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f': movenc: Readd an accidentally removed condition Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Readd an accidentally removed conditionMartin Storsjö2015-01-061-1/+1
| | | | | | | | | | | | | | This was removed accidentally as part of 847bf598. This could cause groundless warning logging. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'Michael Niedermayer2015-01-071-0/+1
|\| | | | | | | | | | | | | * commit '8e03ca2fff40ce065ea5a516200e777c96cd785e': isom: add 'mp1v' fourcc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: add 'mp1v' fourccJustin Ruggles2015-01-061-0/+1
| | | | | | | | | | | | As referenced in the CoreMedia API docs. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'Michael Niedermayer2015-01-073-7/+17
|\| | | | | | | | | | | | | * commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1': msmpeg4: check memory allocations and propagate errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msmpeg4: check memory allocations and propagate errorsVittorio Giovara2015-01-063-7/+17
| | | | | | | | Bug-Id: CID 1257781
* | Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'Michael Niedermayer2015-01-071-4/+3
|\| | | | | | | | | | | | | * commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907': ulti: invert the order of parameters of ulti_decode_frame() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ulti: invert the order of parameters of ulti_decode_frame()Vittorio Giovara2015-01-061-4/+3
| | | | | | | | | | | | | | | | | | This is the order that the caller uses in the rest of the file. Variables are modified to reflect the order above too and their initialization is merged with their declarationt. No behavioral change. Bug-Id: CID 732286
* | Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'Michael Niedermayer2015-01-071-1/+1
|\| | | | | | | | | | | | | * commit '4438c256387a5845e5cdc5c14c43f4047b68301b': vf_interlace: remove the warning tag in the message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: remove the warning tag in the messageVittorio Giovara2015-01-051-1/+1
| | | | | | | | The log level is already a warning.
* | Merge commit '15ea222778caaec0877b3f9938140b707c931d96'Michael Niedermayer2015-01-061-2/+2
|\| | | | | | | | | | | | | * commit '15ea222778caaec0877b3f9938140b707c931d96': vf_interlace: merge FIELD_LOWER check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: merge FIELD_LOWER checkVittorio Giovara2015-01-051-2/+2
| |
* | Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'Michael Niedermayer2015-01-061-1/+1
|\| | | | | | | | | | | | | * commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2': vf_interlace: also assert for height Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: also assert for heightVittorio Giovara2015-01-051-1/+1
| |
* | vfilter/vf_tinterlace: Fix issues with linesize and colsMichael Niedermayer2015-01-061-6/+3
| | | | | | | | | | | | Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e898193311c994b399a8dc60713709092f Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '696141e898193311c994b399a8dc60713709092f'Michael Niedermayer2015-01-061-4/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit '696141e898193311c994b399a8dc60713709092f': vf_interlace: use image width rather than linesize Conflicts: libavfilter/vf_interlace.c See: f043965cd5145d8540d55c013b0d809b6a874c53 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: use image width rather than linesizeVittorio Giovara2015-01-051-4/+5
| | | | | | | | Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
* | Merge commit 'fe082998683334e7f573cfe3876810fb80c5249c'Michael Niedermayer2015-01-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fe082998683334e7f573cfe3876810fb80c5249c': build: Use -Werror=format-security Conflicts: configure See: 97592faa51eacda9a949c4f0ba2a6d7989ef5f3b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Use -Werror=format-securityAgostino Sarubbo2015-01-051-0/+1
| | | | | | | | Reduce the chance of introducing a class of bugs quite hard to track.
* | Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'Michael Niedermayer2015-01-061-11/+12
|\| | | | | | | | | | | | | * commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0': vda: error out if decoded CVPixelBuffer is empty Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vda: error out if decoded CVPixelBuffer is emptyStefano Pigozzi2015-01-051-11/+12
| | | | | | | | | | | | | | | | On some video samples, VDA silently fails to decode frames and returns kVDADecoderNoErr. Error out in these cases to avoid producing AVFrames with empty planes. Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
* | avcodec/ffv1enc: Fix incompatible pointer type warningMichael Niedermayer2015-01-061-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'Michael Niedermayer2015-01-061-8/+9
|\| | | | | | | | | | | | | | | | | | | * commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b': ffv1: const correctness for encode_rgb_frame() Conflicts: libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1: const correctness for encode_rgb_frame()Diego Biurrun2015-01-051-9/+9
| | | | | | | | libavcodec/ffv1enc.c:922:53: warning: passing argument 5 of ‘encode_rgb_frame’ discards ‘const’ qualifier from pointer target type
* | Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'Michael Niedermayer2015-01-061-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'ca09effb01e126b0ac74ff3de70a475423ddee82': ffv1: Drop unnecessary casts and const qualifiers to match function signatures Conflicts: libavcodec/ffv1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1: Drop unnecessary casts and const qualifiers to match function signaturesDiego Biurrun2015-01-051-4/+4
| | | | | | | | libavcodec/ffv1dec.c:898:36: warning: cast discards ‘const’ qualifier from pointer target type
* | Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'Michael Niedermayer2015-01-061-7/+11
|\| | | | | | | | | | | | | * commit '1dd797e3c9f179f957316a0becbec048b42df8aa': swscale: check memory allocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: check memory allocationsVittorio Giovara2015-01-051-7/+11
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1257779
* | Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'Michael Niedermayer2015-01-061-0/+2
|\| | | | | | | | | | | | | * commit '07a0c0f0005072d115ace61e60f46be68582cc3a': opt: check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>