summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/h264_refs: improve key frame detection heuristicMichael Niedermayer2013-12-021-1/+6
| | | | | | | Fixes Ticket3186 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit e3d7a3978b857e32b32575ff78ecc7d67a18687e)
* avcodec/h264_refs: split conditions of if() up for better readabilityMichael Niedermayer2013-12-021-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ab6ea7a81921a168575be63b3d9049ca716e707a) Conflicts: libavcodec/h264_refs.c
* lavc/srtenc: use bprint for text buffers.Nicolas George2013-11-301-20/+28
| | | | | Fix trac ticket #3120. (cherry picked from commit 4b1c9b720e11d200ca7090210b34c409f43fafeb)
* ffmpeg: set VCFR when copying timestampsMichael Niedermayer2013-11-291-0/+3
| | | | | | | | This fixes unreasonable initial frame repeats Fixes Ticket3176 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 738ebb4a0e0c8fbdc83b44cf30b8c9b7ac866270)
* lavfi/af_pan: support unknown layouts on input.Nicolas George2013-11-281-8/+8
| | | | | Fix trac ticket #2899. (cherry picked from commit 7b0a587393e03dab552d66450d43ab82bda0a5a1)
* lavfi/af_pan: support unknown layouts on output.Nicolas George2013-11-281-3/+7
| | | | (cherry picked from commit 4e9adc9b7363cc336e3d47c98455e1508902fd29)
* lswr: fix assert failure on unknown layouts.Nicolas George2013-11-281-2/+2
| | | | (cherry picked from commit 4a640a6ac89099bfb02d6d3d3ada04e321a37476)
* lavfi: parsing helper for unknown channel layouts.Nicolas George2013-11-286-7/+23
| | | | | Make ff_parse_channel_layout() accept unknown layouts too. (cherry picked from commit 6e2473edfda26a556c615ebc04d8aeba800bef7e)
* lavfi/avfiltergraph: do not reduce incompatible lists.Nicolas George2013-11-281-1/+2
| | | | | | A list of "all channel layouts" but not "all channel counts" can not be reduced to a single unknown channel count. (cherry picked from commit d300f5f6f570659e4b58567b35c9e8600c9f2956)
* lavfi/avfiltergraph: suggest a solution when format selection fails.Nicolas George2013-11-281-0/+4
| | | | | | Format selection can fail if unknown channel layouts are used with filters that do not support it. (cherry picked from commit f775eb3fb4c7b716107355e428e40cb63f71ee7a)
* lavd/lavfi: support unknown channel layouts.Nicolas George2013-11-281-0/+4
| | | | (cherry picked from commit 863fb11f63f7f60feec390f3c54dd13606e07d05)
* update for 2.1.1n2.1.1Michael Niedermayer2013-11-203-3/+3
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/pcm-dvd: fix 20/24bit 1 channelMichael Niedermayer2013-11-191-0/+23
| | | | | | | Fixes part of ticket3122 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ab184b298d4a54199986de10927258aed18c7b6b)
* avcodec/pcm-dvd: fix 20bit 2 channelsMichael Niedermayer2013-11-191-4/+4
| | | | | | | Fixes part of ticket3122 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 5db49fc38d9132e134de92584f296559bec3b789)
* avformat/mpegts: fix resync seekMichael Niedermayer2013-11-181-1/+3
| | | | | | | | | The seek ended up seeking before the begin, which caused problems Fixes initial sync issues with libbluray Fixes Ticket3117 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7d0e927a31edb5fb584c2ab17f7fd676838d6639)
* avformat/utils: dont count attached pics toward the probesizeMichael Niedermayer2013-11-181-2/+3
| | | | | | | | Such pics behave more like headers which we also dont count. Fixes Ticket3146 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0)
* build: avoid stdin stall with GNU AS probing.Clément Bœsch2013-11-181-1/+3
| | | | | | | | | a758c5e added probing for various tools, such as AS. Unfortunately, GNU AS is reading stdin with -v, and thus configure is stalled with configure arguments such as --as=as. Fixes Ticket #1898. (cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)
* avformat/image2: allow muxing gif files.Clément Bœsch2013-11-181-3/+39
| | | | | Fixes Ticket #2936. (cherry picked from commit f70db22999d713da3306bf29ec763d670b9bf1ea)
* avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()Michael Niedermayer2013-11-181-1/+1
| | | | | | | | Fixes Ticket3103 Reviewed-by: Thilo Borgmann <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 73d887733dc2ccb5d570615a753d5c44c3f1d9a4)
* Fix example in pullup documentation.Lou Logan2013-11-181-2/+4
| | | | | | | | The pullup filter does not work well with the fps filter, it currently needs -r Signed-off-by: Carl Eugen Hoyos <[email protected]> (cherry picked from commit 6d90a5c149fbdf9678c3f03fac820f835665b985)
* avutil: reintroduce lls1 as the 52 ABI needs itMichael Niedermayer2013-11-174-1/+240
| | | | | | | | | | | | | | | | | | | | | | lls1 taken from ff130d7 This is incompatible with libavcodec version 55.18.100 to 55.43.100 except 55.39.101 This incompatibility is caused by these libavcodec versions depending on a libavutil 52 which is ABI incompatible with the previous ABI 52 you can avoid this incompatibility by upgrading your libavcodec so it does no longer depend on the invalid ABI See: 502ab21af0ca68f76d6112722c46d2f35c004053 See: cc6714bb16b1f0716ba43701d47273dbe9657b8b See: 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 See: Ticket3136 Tested-by: marillat Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b382d09d29be90e0947295a70cdcbaa60b9030b8) Signed-off-by: Michael Niedermayer <[email protected]>
* rename new lls code to lls2 to avoid conflict with the old which has a ↵Michael Niedermayer2013-11-176-54/+28
| | | | | | | | | | | | | different ABI also remove failed attempt at a compatibility layer, the code simply cannot work Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c3814ab654a993723b0e5f14cc252d68f233ad79) Conflicts: libavcodec/version.h
* avutil: rename lls to lls2Michael Niedermayer2013-11-175-5/+5
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b) Signed-off-by: Michael Niedermayer <[email protected]>
* ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer2013-11-173-2/+18
| | | | | | | | | | | | | | | | | | input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit d7ebeba80c609e160a171168b3434c342a652237) Conflicts: ffmpeg.c
* mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2Diego Biurrun2013-11-171-1/+0
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 321514042534a2501a9f6223b88f0d2b8060f858) Signed-off-by: Michael Niedermayer <[email protected]>
* mpegvideo: Fix swapping of UV planes for VCR2Kostya Shishkov2013-11-171-0/+13
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit bae14f38d992f326c94d93f01197ccd84ea62053) Signed-off-by: Michael Niedermayer <[email protected]>
* h264: Do not treat the initial frame special in handling of frame gapsMichael Niedermayer2013-11-171-2/+2
| | | | | | | | | | | | | | The not handling of frame gaps has lead to the lack of a dummy reference frame, which has lead to the failure of decode_slice_header() which has lead to one SEI recovery message being skiped which had introduced a slightly suboptimal recovery point for at least 1 h264 file compared to JM. Found-by: Carl & BugMaster Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9e5ef1c5c37208326c59d642e2dc7afd3f10b09b) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/ffv1enc: Check high bpp RGB against coder type tooMichael Niedermayer2013-11-171-0/+4
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/utils: never decrease has_b_frames in compute_pkt_fields()Michael Niedermayer2013-11-171-1/+2
| | | | | | | | | | | The intent of the original check was to increase has_b_frames when it was incorrectly set to 0. Later codecs allowed larger values Found-by: divVerent Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8b73a3f6f6598cb9249034fa020ddead3c943e2f) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0Michael Niedermayer2013-11-172-2/+31
| | | | | | | | | | | | | | Fixes overreads in HEVC Fixes Ticket3070 Also fixed remaining issues from Ticket3075 and Ticket3076 Some lines of code taken from 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h and 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit fa6fa2162b730336fc1d6ee0d547dcc81f4afbad) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/thp: force moving forwardMichael Niedermayer2013-11-171-1/+1
| | | | | | | | | | Fixes infinite loop Fixes Ticket3098 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6c4b87d3d6ae08a6da16b4616626b4d2a726afbf) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/thp: fix variable types to avoid overflowsMichael Niedermayer2013-11-171-7/+7
| | | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2b1056e4e27b046af3777e8bd65a5145abff878f) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeglsdec: check err value for ls_get_code_runterm()Michael Niedermayer2013-11-171-0/+2
| | | | | | | | | | Fixes infinite loop Fixes Ticket3086 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc) Signed-off-by: Michael Niedermayer <[email protected]>
* lavf/spdifdec: fix demuxing of AAC in IEC 61937Anssi Hannula2013-11-171-1/+1
| | | | | | | | | | | Return value of avpriv_aac_parse_header() is not checked correctly. Fix it. Signed-off-by: Anssi Hannula <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit f86387b6c2b11650cb9d5a8fd886be76e48c665b) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/http: fix cookiesMichael Niedermayer2013-10-311-1/+1
| | | | | | | Fixes Ticket3096 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198)
* avcodec/bink: fix seeking to frame 0Michael Niedermayer2013-10-311-1/+12
| | | | | | | Fixes Ticket3088 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e)
* update for 2.1n2.1Michael Niedermayer2013-10-283-2/+3
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* doc/RELEASE_NOTES: update for 2.1Michael Niedermayer2013-10-281-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avdevice/pulse_audio_enc: remove double ;Michael Niedermayer2013-10-281-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* doc/APIchanges: add 2 missing hashes & versionsMichael Niedermayer2013-10-281-2/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* MAINTAINERS: update which releases i maintainMichael Niedermayer2013-10-281-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Changelog: add 2.1Michael Niedermayer2013-10-281-0/+3
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* hevc: add decode hrdMickaël Raulet2013-10-271-8/+79
| | | | | | (cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e) Signed-off-by: Michael Niedermayer <[email protected]>
* hevc: better mt implementationAnton Khirnov2013-10-273-8/+10
| | | | | | Signed-off-by: Mickaël Raulet <[email protected]> (cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1) Signed-off-by: Michael Niedermayer <[email protected]>
* 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 <[email protected]>
* 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 <[email protected]>
* 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 <[email protected]>
* 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 <[email protected]>
* 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* lavd/fbdev_enc: remove unused variablesLukasz Marek2013-10-271-3/+0
| | | | | Signed-off-by: Lukasz Marek <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>