aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'de6061203e2d509579ab110fb1873aade34320f5'Michael Niedermayer2013-10-281-0/+1
|\ | | | | | | | | | | | | * commit 'de6061203e2d509579ab110fb1873aade34320f5': configure: Disable -Wmaybe-uninitialized by default Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Disable -Wmaybe-uninitialized by defaultLuca Barbato2013-10-281-0/+1
| | | | | | | | | | It is by definition unreliable and causes pointless noise on valid code.
* | Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'Michael Niedermayer2013-10-281-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3': AVOptions: do not range check flag options. Conflicts: libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: do not range check flag options.Anton Khirnov2013-10-271-1/+2
| | | | | | | | | | | | | | It does not make sense in the vast majority of use cases, no currently defined AV_OPT_TYPE_FLAGS options in Libav set the range to anything nontrivial, and many of those get it wrong (the "correct" range is INT_MIN to INT_MAX so that the builtin constant "all" works).
* | Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'Michael Niedermayer2013-10-281-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94603feb1b3ad01a821a1a1cef1570b13f471821': h264_ps: when parsing a VUI fails, only abort when explode is set Merge only for metadata, ignoring invalid data can put the context into an invalid state and can possibly be used for remote code execution exploits. Also we support all non standard VUIs that have been reported so ignoring parsing failure makes no sense for us unless theres some issue that has not been reported Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: when parsing a VUI fails, only abort when explode is setAnton Khirnov2013-10-271-2/+4
| | | | | | | | | | | | A VUI doesn't contain anything strictly necessary for decoding. Apparently there are many samples with truncated VUIs in the wild, this commit should allow decoding them.
* | Merge commit '79ef4b19bfcab8b984682a53bb8561e5c8324731'Michael Niedermayer2013-10-280-0/+0
|\| | | | | | | | | | | | | | | * commit '79ef4b19bfcab8b984682a53bb8561e5c8324731': FATE: add bitexact sws flags to the fieldorder test See: 3a75c4e93b3b6f1aeb9343b933ff15776b5b4b41 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add bitexact sws flags to the fieldorder testPaul B Mahol2013-10-272-26/+26
| | | | | | | | | | | | swscale is called for the 420 to 422 conversion Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'Michael Niedermayer2013-10-281-2/+0
|\| | | | | | | | | | | | | * commit 'ddc589ce98c2bba1e59318b5b0224717325eac46': avconv: drop a now useless variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: drop a now useless variableAnton Khirnov2013-10-271-2/+0
| |
* | hevc: add profile idc warningMickaël Raulet2013-10-281-4/+12
| | | | | | | | | | | | (cherry picked from commit 15f7a481fd19529b13631bfff5b3d65bfe5729d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: refactor pic_arrays and set_spsAnton Khirnov2013-10-281-52/+59
| | | | | | | | | | | | (cherry picked from commit a6686c6d83b50c0962269f2c487f4f0c57e0df79) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: add irap checksAnton Khirnov2013-10-282-5/+15
| | | | | | | | | | | | (cherry picked from commit 3d3bbe35541a308937d0fe72b20a1c29d1c4100d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '529a9893d769f381b72785c500662be2020da5fe'Michael Niedermayer2013-10-282-4/+4
|\| | | | | | | | | | | | | * commit '529a9893d769f381b72785c500662be2020da5fe': avframe: mark source frame const in _ref and _clone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: mark source frame const in _ref and _cloneVittorio Giovara2013-10-272-4/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'Michael Niedermayer2013-10-281-1/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da': mmvideo: fix uninitialized variable use in mm_decode_intra Conflicts: libavcodec/mmvideo.c See: c2e3b564b32d596f5a66d47409f9e07a067a3084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mmvideo: fix uninitialized variable use in mm_decode_intraVittorio Giovara2013-10-271-1/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'Michael Niedermayer2013-10-281-1/+2
|\| | | | | | | | | | | | | * commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5': lavr: check that current_buffer is not NULL before using it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: check that current_buffer is not NULL before using itJustin Ruggles2013-10-271-1/+2
| | | | | | | | | | | | | | Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org
* | cmdutils: fix expected signature for show_colors() functionn2.2-devStefano Sabatini2013-10-282-2/+4
| | | | | | | | | | | | | | | | | | Fix warning: In file included from ffprobe.c:2557:0: cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default] cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default] Spotted-by: Paul B Mahol
* | doc/RELEASE_NOTES: update for 2.1Michael Niedermayer2013-10-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_enc: remove double ;Michael Niedermayer2013-10-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/APIchanges: add 2 missing hashes & versionsMichael Niedermayer2013-10-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: update which releases i maintainMichael Niedermayer2013-10-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: add 2.1Michael Niedermayer2013-10-281-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: add decode hrdMickaël Raulet2013-10-271-8/+79
| | | | | | | | | | | | (cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: better mt implementationAnton Khirnov2013-10-273-8/+10
| | | | | | | | | | | | Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr> (cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: clean up mvs(cherry picked from commit ↵Mickaël Raulet2013-10-271-358/+164
| | | | | | | | | | | | | | | | 955317c09b877a513d3fcfcd1615909b2f4f651c) Decreases the difference to Anton Khirnovs patch v5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: cosmetic change(cherry picked from commit ↵Mickaël Raulet2013-10-272-85/+107
| | | | | | | | | | | | | | | | 3b57513b3f39c04337801fb9d159c7ca8dfa9deb) Decreases the difference to Anton Khirnovs patch v5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: more cosmetic(cherry picked from commit ↵Mickaël Raulet2013-10-272-136/+131
| | | | | | | | | | | | | | | | 9697abe41daa234602915f85bf6b1c0ca0252cff) Decreases the difference to Anton Khirnovs patch v5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc : cosmetic changes(cherry picked from commit ↵Mickaël Raulet2013-10-278-190/+203
| | | | | | | | | | | | | | | | 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd) Decreases the difference to Anton Khirnovs patch v5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add support for CODEC_CAP_DELAY in subtitlesMarton Balint2013-10-274-4/+15
| | | | | | | | | | | | | | | | | | | | | | This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2. For DVB teletext decoding, a single teletext packet can contain multiple teletext pages. In order to support that, the teletext decoder may buffer some pages. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/fbdev_enc: remove unused variablesLukasz Marek2013-10-271-3/+0
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is setMichael Niedermayer2013-10-271-1/+2
| | | | | | | | | | | | This avoids a slowdown with the default of enabled CRC checks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "avcodec/options_table: disable CRC checking by default"Michael Niedermayer2013-10-271-1/+1
| | | | | | | | | | | | This reverts commit c7027ce9eac04fb20bd85fa37dbf24856c080c45. It appears there is no complete consensus on this currently.
* | Revert "avcodec/options_table: set err_detect to careful by default"Michael Niedermayer2013-10-271-1/+1
| | | | | | | | This reverts commit b1348eb68b432041b2557b9073590cf0fa60ff14.
* | lavd/fbdev_enc: more stream validation restrictiveLukasz Marek2013-10-271-18/+4
| | | | | | | | | | | | | | So far fbdev_enc device picked up first video stream and ignored others. It is required to provide exactly one video stream now. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavd/pulse_audio_enc: more stream validation restrictiveLukasz Marek2013-10-271-16/+4
| | | | | | | | | | | | | | So far pulse device picked up first audio stream and ignored others. It is required to provide exactly one audio stream now. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavd:pulse_audio_enc: fix array compared against 0Lukasz Marek2013-10-271-1/+1
| | | | | | | | | | | | fixes CID 1113222 Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavd/pulse_audio_enc: fix timestamp calculationLukasz Marek2013-10-271-1/+15
| | | | | | | | | | | | | | | | Current implementation didn't include duration of last processed packet. Also remove access to st->cur_dts and replace with pkt->pts. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | libavfilter/vf_noise: relicense to LGPLPaul B Mahol2013-10-273-8/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/options_table: set err_detect to careful by defaultMichael Niedermayer2013-10-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options_table: disable CRC checking by defaultAnton Khirnov2013-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit with crc flag 1841819858 decicycles in frame decode, 32 runs, 0 skips 1833937180 decicycles in frame decode, 32 runs, 0 skips 1843283884 decicycles in frame decode, 32 runs, 0 skips without crc flag 1703897301 decicycles in frame decode, 32 runs, 0 skips 1695031879 decicycles in frame decode, 32 runs, 0 skips 1697524383 decicycles in frame decode, 32 runs, 0 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/takdec: also do crc check when er compliant is setMichael Niedermayer2013-10-271-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: Check for memory allocation failure of private dataDerek Buitenhuis2013-10-271-0/+7
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avfiltergraph: Properly handle memory allocation failureDerek Buitenhuis2013-10-271-0/+13
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | timefilter: Handle memory allocation failureDerek Buitenhuis2013-10-274-0/+16
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avcodec/avcodec.h: Add documentation for the AV_EF_* defifinesMichael Niedermayer2013-10-271-8/+8
| | | | | | | | | | | | The documentation is copied from the AVOption texts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | correct the AVOption documentation for AV_EF_CAREFULMichael Niedermayer2013-10-272-2/+2
| | | | | | | | | | | | | | | | The flag was and is intended to be a sane default and thus does not enable time consuming checks. This also matches how the flag is used in decoders and demuxers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: add mergeplanes filterPaul B Mahol2013-10-277-1/+377
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>