summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* fft-test: fix order of operations for calculating the average errorMichael Niedermayer2012-09-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vima: check packet size before initializing bitstream readerPaul B Mahol2012-09-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* vima: fix typo in license headerPaul B Mahol2012-09-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* flac: use get_bits_longlong()Paul B Mahol2012-09-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* tta: let samples declaration match castPaul B Mahol2012-09-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* bitstream: add get_bits_longlong() to support more than 32bitsMichael Niedermayer2012-09-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-30
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: avoid stuck buffer pointer in decode_nal_units mpeg12: fix the semantics of the int* parameter of decode() Conflicts: libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: avoid stuck buffer pointer in decode_nal_unitsJindřich Makovička2012-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decode_nal_units() previously encountered a NAL_END_SEQUENCE, and there are some junk bytes left in the input buffer, but no start codes, buf_index gets stuck 3 bytes before the end of the buffer. This can trigger an infinite loop in the caller code, eg. in try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes, with 3 bytes of the input packet still available. With this change, the remaining bytes are skipped so the whole packet gets consumed. CC:libav-stable@libav.org Signed-off-by: Jindřich Makovička <makovick@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpeg12: fix the semantics of the int* parameter of decode()Anton Khirnov2012-09-29
| | | | | | | | It is got_output, not data_size.
* | Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'Michael Niedermayer2012-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23': mpeg12: move mpeg_decode_frame() lower avsdec: Set dimensions instead of relying on the demuxer. wmalosslessdec: Reset put bit buffer when num_saved_bits is reset. Conflicts: libavcodec/avs.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: move mpeg_decode_frame() lowerAnton Khirnov2012-09-29
| | | | | | | | Avoids a forward declaration of decode_chunks().
| * avsdec: Set dimensions instead of relying on the demuxer.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | | | | | The decode function assumes that the video will have those dimensions. Fixes CVE-2012-2801 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | Fixes CVE-2012-2799 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'Michael Niedermayer2012-09-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6': dfa: improve boundary checks in decode_dds1() wmalosslessdec: Fix reading too many bits in decode_channel_residues() wmalosslessdec: fix a get_bits(0) in decode_ac_filter wmalosslessdec: make MCLMS arrays big enough for what is written into them. indeo4/5: check empty tile size in decode_mb_info(). ivi_common: make ff_ivi_process_empty_tile() static. indeo5: check tile size in decode_mb_info(). indeo3: fix out of cell write. Conflicts: libavcodec/dfa.c libavcodec/indeo3.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dfa: improve boundary checks in decode_dds1()Anton Khirnov2012-09-29
| | | | | | | | | | | | Fixes CVE-2012-2798 CC:libav-stable@libav.org
| * wmalosslessdec: Fix reading too many bits in decode_channel_residues()Anton Khirnov2012-09-29
| | | | | | | | | | | | | | | | | | | | Fixes a part of CVE-2012-2795 CC:libav-stable@libav.org Based on a patch by Michael Niedermayer <michaelni@gmx.at> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * wmalosslessdec: fix a get_bits(0) in decode_ac_filterMichael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | Fixes a part of CVE-2012-2795 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * wmalosslessdec: make MCLMS arrays big enough for what is written into them.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | Fixes a part of CVE-2012-2795 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * indeo4/5: check empty tile size in decode_mb_info().Anton Khirnov2012-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | This prevents writing into a too small array if some parameters changed without the tile being reallocated. Based on a patch by Michael Niedermayer <michaelni@gmx.at> Fixes CVE-2012-2800 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * ivi_common: make ff_ivi_process_empty_tile() static.Anton Khirnov2012-09-29
| | | | | | | | It's not used outside of ivi_common.c
| * indeo5: check tile size in decode_mb_info().Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | | | | | | | This prevents writing into a too small array if some parameters changed without the tile being reallocated. Fixes CVE-2012-2794 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * indeo3: fix out of cell write.Anton Khirnov2012-09-29
| | | | | | | | | | | | | | | | Fixes CVE-2012-2776. CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | get_bits_long: fix variable typeMichael Niedermayer2012-09-30
| | | | | | | | | | | | This fixes a theoretical signed overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cyuv: implement raw cyuvMichael Niedermayer2012-09-30
| | | | | | | | | | | | Fixes Ticket1620 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1enc: fix integer overflow with high resolutions and lots of slices.Michael Niedermayer2012-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bink: reindentMichael Niedermayer2012-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bink: remove unneeded special case in the init code.Michael Niedermayer2012-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bink: get rid of double precision float useMichael Niedermayer2012-09-29
| | | | | | | | | | | | | | Add a small table of integers instead as this is simpler and avoid rounding issues (though such rounding issues are unlikely in this case) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dfa: replace redundant check by assertMichael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | The values are checked in the wraper function used to call this code. This was introduced by: ee715f49a06bf3898246d01b056284a9bb1bcbb9 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmalosslessdec: increase channel_coeffs/residues size wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14. lagarith: check count before writing zeros. wmaprodec: check num_vec_coeffs for validity avidec: use actually read size instead of requested size avidec: return 0, not packet size from read_packet(). Conflicts: libavcodec/lagarith.c libavcodec/wmalosslessdec.c libavcodec/wmaprodec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmalosslessdec: increase channel_coeffs/residues sizeAnton Khirnov2012-09-29
| | | | | | | | | | | | Fixes CVE-2012-2792 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.Anton Khirnov2012-09-29
| |
| * lagarith: check count before writing zeros.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | Fixes CVE-2012-2793 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * wmaprodec: check num_vec_coeffs for validityMichael Niedermayer2012-09-29
| | | | | | | | | | | | | | Fixes CVE-2012-2789 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'Michael Niedermayer2012-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b146d74730ab9ec5abede9066f770ad851e45fbc': indeo4: update AVCodecContext width/height on size change dfa: check that the caller set width/height properly. indeo5dec: Make sure we have had a valid gop header. cavsdec: check for changing w/h. lavc: set channel count from channel layout in avcodec_open2(). doc/platform: Rework the Visual Studio linking section doc/faq: Change the Visual Studio entry to reflect current status doc/platform: Replace Visual Studio section with build instructions doc/platform: Nuke section on linking static MinGW-built libs with MSVC doc/platform: Remove false claim about MinGW installer doc/platform: Mention MinGW-w64 dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction() mpegaudiodec: fix short_start calculation Conflicts: doc/faq.texi doc/platform.texi libavcodec/cavsdec.c libavcodec/indeo5.c libavcodec/ivi_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: update AVCodecContext width/height on size changeMichael Niedermayer2012-09-29
| | | | | | | | | | | | | | Fixes CVE-2012-2787 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * dfa: check that the caller set width/height properly.Anton Khirnov2012-09-29
| | | | | | | | Fixes CVE-2012-2786.
| * indeo5dec: Make sure we have had a valid gop header.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | This prevents decoding happening on a half initialized context. Fixes CVE-2012-2779 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cavsdec: check for changing w/h.Michael Niedermayer2012-09-29
| | | | | | | | | | | | | | | | | | Our decoder does not support changing w/h. Fixes CVE-2012-2777 and CVE-2012-2784. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavc: set channel count from channel layout in avcodec_open2().Anton Khirnov2012-09-29
| | | | | | | | | | Some decoders (e.g. nellymoser) only set channel_layout and do not set channel count.
| * dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()Michael Niedermayer2012-09-28
| | | | | | | | | | | | This should fix the utvideoenc valgrind failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudiodec: fix short_start calculationLuca Barbato2012-09-28
| | | | | | | | | | | | | | The value should be always 3, as it follows from the specification. Fix a stack buffer overflow in exponents_from_scale_factors as reported by asan. Thanks to Dale Curtis for the sample vector.
* | aacdec: detect faac and skip correct amount of startup samplesMichael Niedermayer2012-09-28
| | | | | | | | | | | | This also fixes aac in adts and other containers than mov. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Add missing include to version.hjamal2012-09-28
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopus: Remap channels using libopus' internal remapping. Opus decoder using libopus avcodec: document the use of AVCodecContext.delay for audio decoding vc1dec: add flush function for WMV9 and VC-1 decoders http: Increase buffer sizes to cope with longer URIs nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments h264_refs: Fix debug tprintf argument types golomb: const correctness for get_ue()/get_se() function arguments get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments Conflicts: Changelog libavcodec/Makefile libavcodec/version.h libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopus: Remap channels using libopus' internal remapping.Nathan Caldwell2012-09-28
| | | | | | | | | | | | | | | | This way we can directly remap channels from Opus' channel order to libav's internal channel order, instead of mapping channels from Opus' order to Vorbis' order then to libav's order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Opus decoder using libopusNicolas George2012-09-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avcodec: document the use of AVCodecContext.delay for audio decodingNathan Caldwell2012-09-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vc1dec: add flush function for WMV9 and VC-1 decodersKostya Shishkov2012-09-28
| | | | | | | | CC: libav-stable@libav.org
| * h264_refs: Fix debug tprintf argument typesDiego Biurrun2012-09-27
| |