aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'Michael Niedermayer2012-12-051-8/+20
|\ | | | | | | | | | | | | | | | | | | * commit 'ff953fecffd3b9a616a046723fb9d4690be032a6': lavc: set frame properties in ff_get_buffer(). Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set frame properties in ff_get_buffer().Anton Khirnov2012-12-041-20/+18
| | | | | | | | | | There is no point in duplicating this code in every get_buffer() implementation.
* | Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer2012-12-05168-178/+335
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov2012-12-04141-154/+286
| | | | | | | | It will be useful in the upcoming transition to refcounted AVFrames.
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-054-6/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-043-4/+0
| |
* | vc1dec: Fix null pointer dereference in vc1_decode_skip_blocks()Michael Niedermayer2012-12-051-3/+5
| | | | | | | | | | | | | | | | This handles the last frame being unavailable like all the other code in vc1dec. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/dvdsubdec: accept palette from options.Nicolas George2012-12-051-10/+45
| | | | | | | | | | On DVDs, the palette is part of the IFO file and therefore not available when reading from a dumped VOB file.
* | ff_emulated_edge_mc: fix handling of w/h being 0Michael Niedermayer2012-12-052-0/+6
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1enc: allow encoding with 1 slice for CIF and smaller in version 3Michael Niedermayer2012-12-051-1/+2
| | | | | | | | | | | | | | | | the default is still 4 slices for any resolution, this just allows the user to force 1 slice. This in my quick test improves compression by 1% for a 320x240 sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff decoder: DEEP TVDC 32-bit decoderPeter Ross2012-12-042-4/+68
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | libspeex: allow custom sample rates again.Reimar Döffinger2012-12-031-1/+3
| | | | | | | | | | | | | | This was broken by 3b061c5e10f78caaf3b2a45cf7a92e50d4d20bfb Fixes trac issue #1974. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | takdec: add .sample_fmtsPaul B Mahol2012-12-031-0/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | shorten: update .sample_fmtsPaul B Mahol2012-12-031-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ra144enc: reject unsupported sample ratesPiotr Bandurski2012-12-031-0/+1
| |
* | Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'Michael Niedermayer2012-12-032-10/+16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16': h264: error out on unset current_picture_ptr for h->current_slice > 0 avprobe: report per stream bit rate if set by the decoder aac: avoid a memcpy in sbr_qmf_analysis Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: error out on unset current_picture_ptr for h->current_slice > 0Janne Grunau2012-12-021-0/+5
| | | | | | | | | | | | Fixes a segfault with fuzzed sample sample_varPAR_s11622_r001-02.avi. CC: libav-stable@libav.org
| * aac: avoid a memcpy in sbr_qmf_analysisChristophe Gisquet2012-12-021-10/+11
| | | | | | | | | | | | | | Swapping buffer indices allows saving one memcpy that accounts for 1% of the runtime, according to oprofile. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | vp56: Ignore reconfiguration from the alpha plane.Michael Niedermayer2012-12-031-8/+10
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: check for integer overflow, fix null pointer dereferenceMichael Niedermayer2012-12-021-0/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gifdec: read pixel aspect ratioPaul B Mahol2012-12-021-1/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dcadec: fix reading from prior to an arrayMichael Niedermayer2012-12-021-0/+5
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xxan: more complete ybuf checks, fix out of array accesses.Michael Niedermayer2012-12-021-2/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vmnc: Check for integer overflowMichael Niedermayer2012-12-011-0/+4
| | | | | | | | | | | | | | Fixes null pointer dereference and potential out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dcadec: check lfe fieldMichael Niedermayer2012-12-011-0/+6
| | | | | | | | | | | | | | Fix out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1dec: update w/h only if the header is successfully parsed.Michael Niedermayer2012-12-011-5/+9
| | | | | | | | | | | | | | Prevents inconsistency and out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini2012-12-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
* | gifdec: use av_fast_malloc()Paul B Mahol2012-12-011-7/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | shorten: return more meaningful error codesPaul B Mahol2012-12-011-15/+15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ws-snd1: return meaningful error codePaul B Mahol2012-12-011-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wnv1: return more meaningful error codesPaul B Mahol2012-12-011-4/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xldec: K&R formatting cosmeticsPaul B Mahol2012-12-011-7/+10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xldec: return meaningful error codePaul B Mahol2012-12-011-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | motionpixels: use meaningful error codePaul B Mahol2012-12-011-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pcmdec: check codec_idMichael Niedermayer2012-12-011-0/+5
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qdm2: check array index before use, fix out of array accessesMichael Niedermayer2012-12-011-0/+5
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacps: check iid/icc_par more completely.Michael Niedermayer2012-11-301-0/+17
| | | | | | | | | | | | | | Fixes global out of array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxa: check reference frame availability before use.Michael Niedermayer2012-11-301-0/+4
| | | | | | | | | | | | | | Fix NULL pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: more complete vlc length check, fixes out of array readMichael Niedermayer2012-11-301-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: check smacker_decode_tree() return valueMichael Niedermayer2012-11-301-3/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | undo file modifiers that suck inPaul B Mahol2012-11-302-0/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Move some definitions to header file.Vitaliy E Sugrobov2012-11-302-10/+48
| | | | | | | | | | | | Share them with upcoming demuxer module. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
* | Additional checks to prevent overread.Vitaliy E Sugrobov2012-11-301-1/+23
| | | | | | | | | | | | | | Check for availability of some required amount of bytes in buffer before reading further. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
* | Prepare gif decoder for use in conjunction with gif demuxer.Vitaliy E Sugrobov2012-11-302-49/+240
| | | | | | | | | | | | | | | | | | | | | | Add capability of reading multiple frames instead of only first. Implement support for different gif frame 'disposal methods'. Add option that allows to change background color resulting from conversion of gif with transparency to any other format which not support it. Also bump lavc minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
* | Add meaningful error codes and constants.Vitaliy E Sugrobov2012-11-301-16/+24
| | | | | | | | | | | | | | | | | | | | Replace literals with named constants in several pieces of code like 'return -1' and 'case 0xab'. Change the way decoder handles absence of image data in a file: notify gif_decode_frame() caller with got_picture set to zero instead of returning -1. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
* | Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'Michael Niedermayer2012-11-303-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320': build: The FLAC encoder also depends on the flacdsp code img2: K&R formatting cosmetics h264: check context state before decoding slice data partitions flashsv: make sure data for zlib priming is available Conflicts: libavcodec/Makefile libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: The FLAC encoder also depends on the flacdsp codeDiego Biurrun2012-11-291-1/+1
| | | | | | | | Fixes linking with only the FLAC encoder enabled.
| * h264: check context state before decoding slice data partitionsJanne Grunau2012-11-291-0/+1
| | | | | | | | | | | | | | Fixes mov_h264_aac__Demo_FlagOfOurFathers.mov.SIGSEGV.4e9.656. Found-by: Mateusz "j00ru" Jurczyk CC: libav-stable@libav.org
| * flashsv: make sure data for zlib priming is availableJanne Grunau2012-11-291-0/+5
| | | | | | | | | | | | Fixes a segfault in the fuzzed sample resolutionchange.flv_s314809. CC: libav-stable@libav.org
* | adpcm/thp: cosmetics: reindentPaul B Mahol2012-11-301-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>