summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
Commit message (Collapse)AuthorAge
...
* | cosmetics: group remaining .name and .long_name.Clément Bœsch2013-10-04
| | | | | | | | See b2bed9325.
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-03
| |
* | Rewrite emu_edge functions to have separate src/dst_stride arguments.Ronald S. Bultje2013-09-28
| | | | | | | | | | | | This allows supporting files for which the image stride is smaller than the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
* | avcodec/vc1dec: fix propagating error codes from various functionsMichael Niedermayer2013-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: Fix return code on malloc() failure from ↵Michael Niedermayer2013-09-23
| | | | | | | | | | | | ff_vc1_decode_init_alloc_tables() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9': vc1dec: Check the error handling flags on slice/field header decode errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Check the error handling flags on slice/field header decode errorsMartin Storsjö2013-09-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | * commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd': vc1dec: Don't decode slices when the latest slice header failed to decode Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Don't decode slices when the latest slice header failed to decodeMichael Niedermayer2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | * commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64': vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks See: 09de0ffeab37442d1a31ee194ea6d78a67186de1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocksMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a': vc1dec: Undo mpegvideo initialization if unable to allocate tables Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Undo mpegvideo initialization if unable to allocate tablesMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | | | | | Previously, s->context_initialized was left set to 1 if ff_vc1_decode_init_alloc_tables failed, skipping the initialization completely on the next decode call. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3': vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errorsMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "Merge commit of 'vdpau: remove old-style decoders'"Michael Niedermayer2013-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing changes made to b7fc2693c70fe72936e4ce124c802ac23857c476. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | * commit '43bacd5b7d3d265a77cd29d8abb131057796aecc': vc1: check mb_height validity. See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: check mb_height validity.Luca Barbato2013-08-05
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2': vc1: check the source buffer in vc1_mc functions Conflicts: libavcodec/vc1dec.c See: 3a04c18d899d278eea551c216e5117974063062b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: check the source buffer in vc1_mc functionsLuca Barbato2013-08-05
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8': vdpau: remove old-style decoders Conflicts: libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/vc1dec.c libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: remove old-style decodersRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Avoid a null pointer dereference on oom when decoding vc1.Carl Eugen Hoyos2013-06-29
| | | | | | | | Fixes ticket #2723.
* | avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()Michael Niedermayer2013-06-15
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Disable dead codeMichael Niedermayer2013-06-04
| | | | | | | | | | | | | | | | | | Fixes CID732197/6 A assert is added to check that the disabled code wont be needed in the future. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '728214992e3698305550c1762f973d2ac567f016'Michael Niedermayer2013-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '728214992e3698305550c1762f973d2ac567f016': vc1dec: Remove interlaced warning vc1dec: Fix mixed field/frame intensity compensation vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4 vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed vc1dec: Fix doxy for vc1_mc_4mv_chroma4() vc1dec: Drop old use_ic code from vc1_b_mc vc1: Use shuffled use_ic instead of equally shuffled mv_mode vc1dec: Implement intensity compensation for vc1_interp_mc() Conflicts: Changelog libavcodec/vc1dec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Fix mixed field/frame intensity compensationMichael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4Michael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if ↵Michael Niedermayer2013-05-28
| | | | | | | | | | | | | | | | | | | | | | needed Now it can use different references for those blocks and even use averaging. This fixes several chroma artifacts in several videos. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Fix doxy for vc1_mc_4mv_chroma4()Michael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Drop old use_ic code from vc1_b_mcMichael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1: Use shuffled use_ic instead of equally shuffled mv_modeMichael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Implement intensity compensation for vc1_interp_mc()Michael Niedermayer2013-05-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Redesign the intensity compensationMichael Niedermayer2013-05-28
| | | | | | | | | | | | | | | | | | | | | | Use the intensity-compensated reference frame for subsequent fields/B-frames. Since we currently don't change the reference frame we have to maintain lookup tables for intensity compensation in the following dependent frames. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Shuffle field MVs after decoding, not beforeMichael Niedermayer2013-05-28
| | | | | | | | | | | | | | | | | | | | | | | | This simplifies the code since copying MVs to the reference is not needed anymore (and maybe something about fixing artifacts). Also remove the unused mv_f_last. Fixes a small number of artifacts in black_screen_VC-1.mkv and several more artifacts in other videos. Signed-off-by: Martin Storsjö <martin@martin.st>
* | vc1dec: restructure interpmvp codeMichael Niedermayer2013-05-17
| | | | | | | | | | | | | | This fixes a valgrind warning about use of uninitialized stuff (no actual such use occurs though) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | * commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f': vc1dec: Add support for interlaced B-frames Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Add support for interlaced B-framesSebastian Sandberg2013-05-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavc/vc1dec: fix a few "may be used uninitialized" warnings.Clément Bœsch2013-05-16
| |
* | vc1dec: silence "may be used uninitialized in this function" warning from gccMichael Niedermayer2013-05-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Use linker hardening flags on mingw vc1: Make INIT_LUT() self contained vc1: Simplify code by using INIT_LUT() vc1: Move INIT_LUT() further up to allow using it in more places vc1dec: Remove some now unused variables vc1dec: Do not allow field_mode to change after the first header vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma() vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma() vc1dec: Factorize picture pointer selection code vc1dec: Factorize srcU/V offseting vc1dec: Fix tff == 0 handling in init_block_index() vc1dec: Update destination pointers in context for fields Conflicts: libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Remove some now unused variablesMartin Storsjö2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Do not allow field_mode to change after the first headerMichael Niedermayer2013-05-15
| | | | | | | | | | | | | | | | This fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_headerMartin Storsjö2013-05-15
| | | | | | | | | | | | | | | | This is required if we return other error codes than explicitly -1, which so far has been the only other possible return value besides 0. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()Michael Niedermayer2013-05-15
| | | | | | | | | | | | No sample tried shows a difference. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()Michael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize picture pointer selection codeMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Factorize srcU/V offsetingMichael Niedermayer2013-05-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1dec: Fix tff == 0 handling in init_block_index()Michael Niedermayer2013-05-15
| | | | | | | | | | | | This fixes several files from VLC ticket 5887. Signed-off-by: Martin Storsjö <martin@martin.st>