summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/tiff_common: Improve formating of long arraysMichael Niedermayer2013-10-031-10/+14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: add av_codec_get_max_lowres()Michael Niedermayer2013-10-033-3/+10
| | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'rbultje/master'Michael Niedermayer2013-10-0310-0/+8463
|\ | | | | | | | | | | | | | | | | * rbultje/master: Full-pixel MC functions. VP9 MC (ssse3) optimizations. Native VP9 decoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Full-pixel MC functions.Ronald S. Bultje2013-10-022-0/+100
| | | | | | | | Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.
| * VP9 MC (ssse3) optimizations.Ronald S. Bultje2013-10-025-0/+398
| | | | | | | | Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.
| * Native VP9 decoder.Ronald S. Bultje2013-10-027-0/+7965
| | | | | | | | | | Authors: Ronald S. Bultje <rsbultje gmail com>, Clement Boesch <u pkh me>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-031-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: mark deprecated AVCodec.max_lowres for removal on next bump Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavc: mark deprecated AVCodec.max_lowres for removal on next bumpAnton Khirnov2013-10-021-0/+2
| | |
* | | Print pix_fmt name on h264 context reinitialisation.Carl Eugen Hoyos2013-10-031-1/+1
| | |
* | | VC1 VDPAU: Mark missing reference frames as such.Reimar Döffinger2013-10-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the code passes some nonsense values as references instead, causing corruption with NVidia's and assertion failures with Mesa's implementation. For non-corrupted input this mostly happens in interlaced bitstreams, e.g. http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv. The != VDP_INVALID handle assert does not trigger (and probably is quite nonsense) because the frames are initialized to 0. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | avcodec/imgconvert/get_color_type: fix type for PAL8Michael Niedermayer2013-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes Ticket3008 Fate changes as PAL8 gets used instead of BGR8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: use designated initializers for bitstream filtersPaul B Mahol2013-10-0211-36/+27
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | atrac3: Generalize gain compensation codeMaxim Poliakovski2013-10-023-69/+113
| | | | | | | | | | | | | | | | | | | | | Move it to the ATRAC common code, so it can be reused in the umpcoming ATRAC3+ decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3/decode_gain_control: cosmeticsMaxim Poliakovski2013-10-021-13/+12
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3: rename num_gain_data to num_pointsMaxim Poliakovski2013-10-021-7/+7
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3: Rename GainInfo to AtracGainInfoMaxim Poliakovski2013-10-021-6/+6
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: limit line length to 80 charsMaxim Poliakovski2013-10-022-2/+4
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Move doxygen comments to the headerMaxim Poliakovski2013-10-022-19/+16
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Update copyright info and file description.Maxim Poliakovski2013-10-022-4/+6
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Add missing av_cold.Maxim Poliakovski2013-10-021-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/wmalosslessdec: check block_alignMichael Niedermayer2013-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Code copied from wmaprodec Fixes null pointer dereference Fixes Ticket3002 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/fraps: increase vlc nb_bitsMichael Niedermayer2013-10-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This should fix decoding the file in: http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078 No i dont have the file so i cant test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | skip_bits: dont call UPDATE_CACHEMichael Niedermayer2013-09-301-1/+0
| | | | | | | | | | | | | | | | | | UPDATE_CACHE isnt needed and can cause segfaults Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'Michael Niedermayer2013-09-301-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f': pcx: Return an error on broken palette if err_detect is set to 'explode' Conflicts: libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Return an error on broken palette if err_detect is set to 'explode'Martin Storsjö2013-09-291-2/+4
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'Michael Niedermayer2013-09-301-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547': pcx: Check the packet size before assuming it fits a palette Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Check the packet size before assuming it fits a paletteMartin Storsjö2013-09-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This fixes reads out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'Michael Niedermayer2013-09-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6': rpza: Fix a buffer size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rpza: Fix a buffer size checkMartin Storsjö2013-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We read 2 bytes for 15 out of 16 pixels, therefore we need to have at least 30 bytes, not 16. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'Michael Niedermayer2013-09-301-6/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc': xxan: Disallow odd width See: 77693c541a541661357a0edd5bbaae69c64b2039 See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xxan: Disallow odd widthMartin Storsjö2013-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Decoded data is always written in pairs within this decoder. This fixes writes out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'Michael Niedermayer2013-09-301-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82': xan: Only read within the data that actually was initialized Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xan: Only read within the data that actually was initializedMartin Storsjö2013-09-291-5/+7
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'Michael Niedermayer2013-09-301-17/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit '30db94dc399f6e4ef8905049d9b740556f0fce47': xan: Use bytestream2 to limit reading to within the buffer Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xan: Use bytestream2 to limit reading to within the bufferMartin Storsjö2013-09-291-12/+10
| | | | | | | | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'Michael Niedermayer2013-09-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887': pcx: Consume the whole packet if giving up due to missing palette Conflicts: libavcodec/pcx.c See: b4e516e30e7004a0454a9009080c4de38987189a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pcx: Consume the whole packet if giving up due to missing paletteMartin Storsjö2013-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we returned 0, meaning successful decoding but 0 bytes consumed, leading to an infinite loop. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'Michael Niedermayer2013-09-301-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7': pngdec: Stop trying to decode once inflate returns Z_STREAM_END Conflicts: libavcodec/pngdec.c See: 65bf9a44d7b0295e03463fd143499ab5b85d0cb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pngdec: Stop trying to decode once inflate returns Z_STREAM_ENDMartin Storsjö2013-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the input buffer contains more data after the deflate stream, the loop previously left running infinitely, with inflate returning Z_STREAM_END. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Merge commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188'Michael Niedermayer2013-09-291-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188': alac: Do bounds checking of lpc_order read from the bitstream See: fd4f4923cce6a2cbf4f48640b4ac706e614a1594 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | alac: Do bounds checking of lpc_order read from the bitstreamMartin Storsjö2013-09-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | In lpc_prediction(), we write up to array element 'lpc_order' in an array allocated to hold 'max_samples_per_frame' elements. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | avcodec/tiff_common: fix bprint max sizesMichael Niedermayer2013-09-291-5/+5
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/exif: print bytes and undefined types as scalar listsMichael Niedermayer2013-09-291-1/+1
| | | | | | | | | | | | | | | | | | This prevents odd characters from ending in the fate test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/tiff_common: add ff_tadd_bytes_metadata()Michael Niedermayer2013-09-292-0/+37
| |/ |/| | | | | | | | | | | The le argument is passed so the function has the same prototype as the other similar functions. It is otherwise unused Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rewrite emu_edge functions to have separate src/dst_stride arguments.Ronald S. Bultje2013-09-2820-674/+657
| | | | | | | | | | | | 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.
* | vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.Ronald S. Bultje2013-09-281-78/+87
| |
* | avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()Michael Niedermayer2013-09-284-7/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopenjpeg: fix encoding of odd sized subsampled imagesMichael Bradshaw2013-09-281-17/+62
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Convert multiplier for MV from int to ptrdiff_t.Ronald S. Bultje2013-09-2817-31/+32
| | | | | | | | | | | | | | This prevents emulated_edge_mc from not undoing mvy*stride-related integer overflows. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/imc: Check flcoeffs5Michael Niedermayer2013-09-271-1/+6
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket2996 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>