summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.c
Commit message (Collapse)AuthorAge
* Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'Michael Niedermayer2013-11-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '967cd6fafbf2fdec9cbe011296ad34a70212427e': libopenjpegdec: stop using deprecated avcodec_set_dimensions kgv1dec: stop using deprecated avcodec_set_dimensions ivi_common: stop using deprecated avcodec_set_dimensions indeo3: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/ivi_common.c libavcodec/kgv1dec.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | avcodec/ivi_common: make while get_bits loop more robust by checking bits leftMichael Niedermayer2013-10-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | * commit 'a92538b7c0defc86c55fb91f55dfa36aad192673': ivi_common: Make sure color planes have been initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: Make sure color planes have been initializedMartin Storsjö2013-09-17
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f': ivi_common: Make some tables only used within the file static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: Make some tables only used within the file staticDiego Biurrun2013-08-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Reject impossible FRAMETYPE_NULL Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Reject impossible FRAMETYPE_NULLLuca Barbato2013-07-15
| | | | | | | | | | | | | | | | A frame marked FRAMETYPE_NULL cannot be scalable and requires a previous frame successfully decoded. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f9e5261cab067be7278f73d515bc9b601eb56202': indeo: Do not reference mismatched tiles Conflicts: libavcodec/ivi_common.c See: dab70c62d20081bcf879b7b6bc3ffabc2e331542 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Do not reference mismatched tilesLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | * commit '28dda8a691f1c723a4a9365ab85f9625f1330096': indeo: Sanitize ff_ivi_init_planes fail paths Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Sanitize ff_ivi_init_planes fail pathsLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd': indeo: Bound-check before applying motion compensation The added checks and one previously added check are replaced by asserts, the conditions can only be true when vectors are invalid or there are worse inconsistencies. We are checking the vectors validity and there should be no inconsistencies, thus the checks should not be needed. Also no files are known to cause any anomalies in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Bound-check before applying motion compensationLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Bound-check before applying transform Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c See: af388237093ed6df6f5118b34ef938a2ca2ffbda, 0846719dd11ab3f7a7caee13e7af71f71d913389 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Bound-check before applying transformLuca Barbato2013-07-13
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6a10142faa1cca8ba2bfe51b970754f62d60f320': indeo: reject negative array indexes Conflicts: libavcodec/ivi_common.c See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: reject negative array indexesLuca Barbato2013-07-04
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | * commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911': indeo: Cosmetic formatting Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Cosmetic formattingLuca Barbato2013-07-04
| | | | | | | | Trim some overly long lines.
* | Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | * commit '62256010e9bc8879e2bf7f3b94af8ff85e239082': indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocksLuca Barbato2013-07-04
| | | | | | | | | | Spin large and mostly self contained blocks into stand alone functions.
* | Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | * commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912': indeo: Refactor ff_ivi_dec_huff_desc Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Refactor ff_ivi_dec_huff_descLuca Barbato2013-07-04
| | | | | | | | Spare an indentation level.
* | Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb': indeo: use a typedef for the mc function pointer cabac: x86 version of get_cabac_bypass aic: use chroma scan tables while decoding luma component in progressive mode Conflicts: libavcodec/aic.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: use a typedef for the mc function pointerLuca Barbato2013-07-04
| |
| * indeo: check for reference when inheriting mvsLuca Barbato2013-07-01
| | | | | | | | | | | | | | The same is done already for qdelta. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'Michael Niedermayer2013-07-01
|\| | | | | | | | | | | | | * commit 'dd3754a48854cd570d38db72394491aab0f36570': indeo: use proper error code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: use proper error codeLuca Barbato2013-07-01
| |
* | Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'Michael Niedermayer2013-07-01
|\| | | | | | | | | | | | | * commit '7388c0c58601477db076e2e74e8b11f8a644384a': indeo: Properly forward the error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Properly forward the error codesLuca Barbato2013-07-01
| | | | | | | | | | | | | | | | If the tile data size does not match the buffer size it did not return an AVERROR_INVALIDDATA causing futher corruption later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-01
|\| | | | | | | | | | | | | | | * qatar/master: indeo4: expand allowed quantiser range configure: icl: Merge -Qdiag-error parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: expand allowed quantiser rangeKostya Shishkov2013-06-01
| | | | | | | | | | | | | | | | Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping quantiser leads to incorrect quantisation and DC prediction on low-quality videos. This fixes bug 259.
* | Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487': avcodec: Add av_cold attributes to init functions missing them Conflicts: libavcodec/aacpsy.c libavcodec/atrac3.c libavcodec/dvdsubdec.c libavcodec/ffv1.c libavcodec/ffv1enc.c libavcodec/h261enc.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/h264pred.c libavcodec/libschroedingerenc.c libavcodec/libxvid_rc.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/proresdsp.c libavcodec/rangecoder.c libavcodec/videodsp.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-04
| |
* | lavc: factorize ff_{thread_,re,}get_buffer error messages.Clément Bœsch2013-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coccinelle profile used: @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_get_buffer(ctx, f, flags)) < 0) + return r; @@ expression r, ctx, f, loglevel, str; @@ -if ((r = ff_reget_buffer(ctx, f)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_reget_buffer(ctx, f)) < 0) + return r; @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) + return r; ...along with some manual patches for the remaining ones.
* | Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cacad1c058f66558ec727faac3b277d2dee264d4': wmaprodec: require block_align to be set. wmadec: require block_align to be set. ivi_common: do not call MC for intra frames when dc_transform is unset Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: do not call MC for intra frames when dc_transform is unsetAnton Khirnov2013-03-08
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc decoders: work with refcounted frames.Anton Khirnov2013-03-08
| |
* | ivi_common: Fix use of uninitialized warningsMichael Niedermayer2012-12-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | * qatar/master: ivi_common: check that scan pattern is set before using it. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: check that scan pattern is set before using it.Anton Khirnov2012-12-14
| | | | | | | | | | | | Fixes CVE-2012-2791. CC: libav-stable@libav.org
* | Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'Michael Niedermayer2012-12-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd': ivi_common: use proper logging context in ivi_decode_blocks(). ivi_common: make some functions and tables static. asyncts: ignore min_delta only if first_pts is set Conflicts: libavcodec/ivi_common.c libavcodec/ivi_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: use proper logging context in ivi_decode_blocks().Anton Khirnov2012-12-14
| |
| * ivi_common: make some functions and tables static.Anton Khirnov2012-12-14
| |
* | Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-04
| | | | | | | | It's got_frame, not data size
* | Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>