summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"Michael Niedermayer2014-10-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.Michael Niedermayer2014-10-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fix seperator typoMichael Niedermayer2014-10-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'Michael Niedermayer2014-10-09
|\ | | | | | | | | | | | | | | * commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7': vc1: initialize color properties See: ddabecbbf5509325c6c695ccc60d67c0af2065f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: initialize color propertiesVittorio Giovara2014-10-08
| |
* | Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit 'eddf95283fbba1b469b76e7518bc3941f671b193': vp9: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp9: initialize color space and range propertiesVittorio Giovara2014-10-08
| |
* | Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '65875a8b3b079752da25a61ec188d2e3d90a569f': vp8: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp8: initialize color space and range propertiesVittorio Giovara2014-10-08
| |
* | Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '586ea0379c207a942c1f2d61e0b3a63c458cc598': avcodec: fix colorspace option description Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: fix colorspace option descriptionVittorio Giovara2014-10-08
| |
* | Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | | | | | * commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b': avcodec: add enum values on chroma sample location Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add enum values on chroma sample locationMarc-Antoine Arnaud2014-10-08
| |
* | Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '9d5fed6dc4cccb0689f694112f5026988bebc472': avcodec: fix descriptions on color transfer options Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: fix descriptions on color transfer optionsMarc-Antoine Arnaud2014-10-08
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '9f3a70c44224ed92d91df65bb9470a2649e7d019': dump: print the original coded dimensions when available Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: print the original coded dimensions when availableVittorio Giovara2014-10-08
| |
* | Merge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | | | | | * commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f': dump: print detailed color space information full color triplets are only printed if they are not all equal, otherwise they are printed as before Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: print detailed color space informationVittorio Giovara2014-10-08
| |
* | avcodec: Allow choosing the dump format field separator.Michael Niedermayer2014-10-09
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | | | | | | | * commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8': dump: split audio and video probing on multiple lines Conflicts: libavcodec/utils.c libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: split audio and video probing on multiple linesVittorio Giovara2014-10-08
| | | | | | | | Also always report pixel format.
* | Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | * commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659': avcodec: make sure color_range is properly initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: make sure color_range is properly initializedVittorio Giovara2014-10-08
| |
* | Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | | | | | | | | | * commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576': vc1: Split the decoder in components Conflicts: libavcodec/Makefile libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Split the decoder in componentsLuca Barbato2014-10-08
| | | | | | | | Speed up the overall compilation time.
* | avcodec/avpicture: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bfi: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d91abade29e43bb45c881d45909b8ee77e904e2'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | * commit '2d91abade29e43bb45c881d45909b8ee77e904e2': x86: h264_intrapred: Don't treat 32-bit integers as 64-bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_intrapred: Don't treat 32-bit integers as 64-bitHenrik Gramner2014-10-08
| | | | | | | | | | | | The upper halves are not guaranteed to be zero in x86-64. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * jpeg2000: split off inverse MCT as Jpeg2000DSPJames Almer2014-10-08
| | | | | | | | | | | | | | This makes the addition of arch optimized functions easier. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/h264: Undefined behavior (left shift of 12852653 by 8 places cannot ↵Michael Niedermayer2014-10-08
| | | | | | | | | | | | | | | | | | be represented in type 'int') Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mmvideo: Fix undefined behavior (left shift of negative value)Michael Niedermayer2014-10-08
| | | | | | | | | | | | | | Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9a03c2323593173a201cb75edd1b49887cf811ed'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a03c2323593173a201cb75edd1b49887cf811ed': h263dec: Force padding bug workaround for H.263. This is not merged as it breaks a good part of the error concealment/resilience for H.263 Also, messenger.h263 plays fine in ffmpeg. If anyone has any other h263 files that do not work, please open an issue on trak or mail me! See: d225b0f7aaa65eafccc87165130e1c4bab71708b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Force padding bug workaround for H.263.Josh Allmann2014-10-07
| | | | | | | | | | | | Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | | | | | | | * commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec': hevc_mvs: make sure to always initialize the temporal MV fully Conflicts: libavcodec/hevc_mvs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_mvs: make sure to always initialize the temporal MV fullyAnton Khirnov2014-10-07
| | | | | | | | | | | | | | | | The spec requires this. Fixes uninitialized reads on some samples. Remove now unnecessary initialization of the whole merge candidate list.
* | Merge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | * commit '79a60c8e779242b5ba4c531b2c706c871e8e6420': hevc_mvs: initialize the temporal MV in case of missing ref Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_mvs: initialize the temporal MV in case of missing refAnton Khirnov2014-10-07
| | | | | | | | The caller expects the MV to always be initialized.
* | avcodec/escape124: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avpacket: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avpacket: simplify freeing pkt->dataMichael Niedermayer2014-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'Michael Niedermayer2014-10-07
|\| | | | | | | | | | | | | * commit '153fadc390d05aa47e5e2c56290401898fe41a23': ff_get_format: fix infinite loop Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ff_get_format: fix infinite loopRémi Denis-Courmont2014-10-06
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'Michael Niedermayer2014-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '577899a6458ccad9026eb268f10dc0b39c224c8d': lavc: specify the behavior of av_lockmgr_register on failure. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h See: a950edb472e8823e34832c7313ba447b2db76f27 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: specify the behavior of av_lockmgr_register on failure.Manfred Georg2014-10-06
| | | | | | | | | | | | | | | | | | | | | | The register function now specifies that the user callback should leave things in the same state that it found them on failure but that failure to destroy is ignored by the library. The register function is now explicit about its behavior on failure (it unregisters the previous callback and destroys all mutex). Signed-off-by: Manfred Georg <mgeorg@google.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/vdpau: do not dereference hwctx before checking it for NULLMichael Niedermayer2014-10-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>