summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * g2meet: Respect cursor_stride properly everywhereKostya Shishkov2013-09-25
| | | | | | | | | | | | This fixes a regression with rgb cursors since b1e46988. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegenc: Better heuristic for ordering packetsMichael Niedermayer2013-09-26
| | | | | | | | | | | | This prevents underflows in quite constrained cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Better default for max_delayMichael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: change assert to av_assert0Michael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: improve field names in underflow error messageMichael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/wmalosslessdec: Fix return code for invalid buffer sizesMichael Niedermayer2013-09-25
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket2979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flicvideo: fix infinite loopsPaul B Mahol2013-09-25
| | | | | | | | | | | | Fixes #2995. Reported-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/wmaprodec: check that there are input bits left in ↵Michael Niedermayer2013-09-25
| | | | | | | | | | | | | | | | | | decode_subframe_length() Fixes infinite loop Fixes Ticket2987 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/lagarith: check scaled probabilitiesMichael Niedermayer2013-09-25
| | | | | | | | | | | | | | Prevents infinite loop Fixes Ticket2988 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cabac: remove h264_lps_stateMichael Niedermayer2013-09-25
| | | | | | | | | | | | | | The only use case of it was the selftest code, and there the slightly more complex indexing that is needed after its removial doesnt matter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | * qatar/master: lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc doxy: document that avcodec_flush_buffers() invalidates decoded framesAnton Khirnov2013-09-24
| |
* | Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | | | | | | | | | * commit '2725f2d40315b56f17c5dffe39dda7d94786302d': doc/filters: fix an option name in the unsharp docs Conflicts: doc/filters.texi See: b7b72963e06f21fb985c58100c7d048cfea2736a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc/filters: fix an option name in the unsharp docsAnton Khirnov2013-09-24
| |
* | Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | | | * commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5': h264: do not reinitialize the global cabac tables at each slice header See: 1e2e2c8095de2d9ea3259305cfeff28f40e4ca12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not reinitialize the global cabac tables at each slice headerAnton Khirnov2013-09-24
| |
* | Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | | | | | | | * commit 'e880418660c80e2f12a123e131975cdb6b12cd13': cabac: remove write-only h264_mps_state[] Conflicts: libavcodec/cabac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cabac: remove write-only h264_mps_state[]Anton Khirnov2013-09-24
| |
* | Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | * commit '668643b9239c70b777aea322eab411ebc960d9a0': matroskadec: check av_strdup() when setting defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: check av_strdup() when setting defaultsAnton Khirnov2013-09-24
| |
* | avcodec/pngdec: check for stream end in png_decode_idat()Michael Niedermayer2013-09-25
| | | | | | | | | | | | | | Fix infinite loop Fix Ticket2978 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: check qmin/qmaxMichael Niedermayer2013-09-25
| | | | | | | | | | | | Fixes Ticket2990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix regression with rgb cursorsMichael Niedermayer2013-09-25
| | | | | | | | | | | | Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()Michael Niedermayer2013-09-24
| | | | | | | | | | | | This is in line with the other functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffhash: Change size to an intAlex Smith2013-09-24
| | | | | | | | | | | | | | | | This fixes compilation with MSVC and ICL, and makes ffhash consistent with how the rest of the codebase uses read(). Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add support for interleaved chroma formats to libx264. Conflicts: libavcodec/libx264.c See: 283fb76d3d6eef1337ed493eae25fc0fc3752ce7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add support for interleaved chroma formats to libx264.Kieran Kunhya2013-09-24
| | | | | | | | | | | | Interleaved chroma is x264's native format Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | * commit 'a454dec19aa6666b555deec431bc42eda391d7b6': pixdesc: fix NV20* descriptors h264_sei: check SEI size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: fix NV20* descriptorsMichael Niedermayer2013-09-24
| | | | | | | | | | | | They were inconsistent (overlapping fields and wrong sizes) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * h264_sei: check SEI sizeMichael Niedermayer2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6': h264: do not discard NAL_SEI when skipping frames Conflicts: libavcodec/h264.c See: 7d75fb381ba774a8d2fa7de0c12140cd465c0255 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not discard NAL_SEI when skipping framesRainer Hochecker2013-09-24
| | | | | | | | | | | | Setting AVDISCARD_NONREF (e.g. after flushing) resulted in 100% dropped frames. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | * commit 'edaba18021e4793116f0f266e65077578a5e742e': h264: log extradata skip only for non-ignored NALs Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: log extradata skip only for non-ignored NALsVittorio Giovara2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | * commit '26179964ff3fa1173e6f512c5735ba8223e2395d': h264_sei: log unknown sei messages Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: log unknown sei messagesVittorio Giovara2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d': mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 Conflicts: libavcodec/mpegvideo.c The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0Martin Storsjö2013-09-24
| | | | | | | | | | | | | | | | | | | | | | | | This fixes breakage in a few fate tests on certain setups (that for some reason didn't break on OS X) after the previous commit (8812a8057). Currently, some video streams are initialized in ff_MPV_common_init with width/height set at 0 and only changed to a proper video size with ff_MPV_common_frame_size_change later. The breakage was diagnosed by Anton Khirnov. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | * commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe': configure: Enable -Qansi-alias for icl 14+ Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Enable -Qansi-alias for icl 14+Alex Smith2013-09-24
| | | | | | | | | | | | | | Qansi-alias worked on 12.x, then caused miscompilation on 13.x, but now works again passing all FATE tests for icl version 14. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Remove a hack that can cause infinite loops Conflicts: libavcodec/h263dec.c See: d2981b8ef191fc7876e3486e42222ab6a8777c24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Remove a hack that can cause infinite loopsMartin Storsjö2013-09-23
| | | | | | | | | | | | | | | | The actual usefulness of the hack is not known, and it does cause infinite loops with some broken input files. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/mjpegenc: dont store DQT for LJPEGMichael Niedermayer2013-09-24
| | | | | | | | | | | | | | This may improve compatibility of lgpegs generated by libavcodec also encoded ljpegs become slightly smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/omadec: simplify checks in nprobe()Michael Niedermayer2013-09-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/outdevs: add sdl window_fullscreen optionLukasz Marek2013-09-23
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.Ronald S. Bultje2013-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-09-23
|\ \ | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/dualinput: reimplement on top of framesync. lavfi: add an API to synchronize multiple video inputs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/dualinput: reimplement on top of framesync.Nicolas George2013-09-23
| | |
| * | lavfi: add an API to synchronize multiple video inputs.Nicolas George2013-09-23
| | | | | | | | | | | | | | | | | | Compared to dualinput, this API can handle more than two inputs and can generate frames synchronized to any or all input streams.
* | | avcodec/vc1dec: fix propagating error codes from various functionsMichael Niedermayer2013-09-23
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>