summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'Michael Niedermayer2013-03-131-3/+2
|\ | | | | | | | | | | | | | | | | | | | | * commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480': Add informative messages to av_log_ask_for_sample calls lacking them anm: Get rid of some very silly goto statements Conflicts: libavformat/anm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add informative messages to av_log_ask_for_sample calls lacking themDiego Biurrun2013-03-121-3/+2
| |
* | Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'Michael Niedermayer2013-03-131-2/+3
|\ \ | |/ | | | | | | | | | | | | | | * commit '555000c7d5c1e13043a948ebc48d2939b0ba6536': h264: check that DPB is allocated before accessing it in flush_dpb() vf_hqdn3d: fix uninitialized variable use vf_gradfun: fix uninitialized variable use Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: check that DPB is allocated before accessing it in flush_dpb()Anton Khirnov2013-03-111-2/+3
| |
* | Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'Michael Niedermayer2013-03-131-5/+2
|\ \ | |/ | | | | | | | | | | | | * commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762': h264: remove a useless svq3 condition mpegvideo: remove FMT_H264 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: remove a useless svq3 conditionAnton Khirnov2013-03-111-5/+2
| | | | | | | | The svq3 decoder does not call ff_h264_frame_start() anymore.
* | Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.Anton Khirnov2013-03-081-1/+1
| |
* | Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'Michael Niedermayer2013-03-121-1/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9': lavc: stop setting AVFrame.motion_subsample_log2 avserver: don't set deprecated options. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: stop setting AVFrame.motion_subsample_log2Anton Khirnov2013-03-081-1/+0
| | | | | | | | | | It is not used inside lavc anywhere and now it makes no sense to export it.
* | avcodec: fix motion vector vissualizationMichael Niedermayer2013-03-121-1/+1
| | | | | | | | | | | | was broken by the buffer ref stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264/mpegvideo: fix ff_print_debug_info2 argumentsMichael Niedermayer2013-03-121-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix null pointer dereference and assertion failureMichael Niedermayer2013-03-121-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-121-173/+255
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-171/+247
| |
* | Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'Michael Niedermayer2013-03-081-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51': configure: Add missing h264chroma dependencies to vp5, vp6 Add missing error_resilience includes to files that use ER Conflicts: configure libavcodec/mpeg12.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing error_resilience includes to files that use ERDiego Biurrun2013-03-071-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-071-21/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate the deinterlace functions in libavcodec h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band Conflicts: configure ffmpeg_opt.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Integrate draw_horiz_band into ff_h264_draw_horiz_bandRonald S. Bultje2013-03-071-4/+40
| | | | | | | | | | | | | | | | | | | | This makes the decoder independent of mpegvideo. This copy of the draw_horiz_band code is simplified compared to the "generic" mpegvideo one which still has a number of special cases for different codecs. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Rename the jpeg_420 pixfmt list to match the common naming structureMartin Storsjö2013-03-071-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'Michael Niedermayer2013-03-071-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '5da51284937649a8ebb84fa951c235438fcbf8ae': cavs: Add a dependency on h264chroma lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs Conflicts: libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecsRonald S. Bultje2013-03-061-1/+18
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'Michael Niedermayer2013-03-061-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5': shorten: set invalid channels count to 0 vorbisdec: check memory allocations h264: check for luma and chroma bit dept being equal Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: check for luma and chroma bit dept being equalLuca Barbato2013-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | The decoder assumes a single bit depth for all the planes while the specification allows different bit depths for luma and chroma. Avoid the possible problems described in CVE-2013-2277 CC: libav-stable@libav.org
* | h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.Ronald S. Bultje2013-03-031-2/+4
| | | | | | | | | | | | | | The code is located in mpegvideo, and it's likely that in a minimal config, we don't want to include debug info anyway. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: make it possible to compile without error_resilience.Ronald S. Bultje2013-03-031-16/+33
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: add a copy of draw_horiz_band.Ronald S. Bultje2013-03-031-4/+46
| | | | | | | | | | | | This makes the decoder independent of mpegvideo. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-021-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: h264: set ref_count to 0 for intra slices. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: set ref_count to 0 for intra slices.Anton Khirnov2013-03-021-1/+4
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'Michael Niedermayer2013-03-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8': h264: on reference overflow, reset the reference count to 0, not 1. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: on reference overflow, reset the reference count to 0, not 1.Anton Khirnov2013-03-021-1/+1
| | | | | | | | | | | | | | Since decode_slice_header() returns before the reference lists are constructed, there are zero valid references. CC:libav-stable@libav.org
* | Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'Michael Niedermayer2013-03-021-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9': h264: do not copy ref count/ref2frm when updating per-frame context flvdec: Check the return value of a malloc Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not copy ref count/ref2frm when updating per-frame contextAnton Khirnov2013-03-021-2/+0
| | | | | | | | They are filled in decode_slice_header() anyway.
| * h264/svq3: Stop using draw_edgesRonald S. Bultje2013-02-191-36/+6
| | | | | | | | | | | | | | | | | | | | | | Instead, only extend edges on-demand when the motion vector actually crosses the visible decoded area using ff_emulated_edge_mc(). This changes decoding time for cathedral from 8.722sec to 8.706sec, i.e. 0.2% faster overall. More generally (VP8 uses this also), low-motion content gets significant speed improvements, whereas high-motion content tends to decode in approximately the same time. Signed-off-by: Martin Storsjö <martin@martin.st>
* | h264: Silence warning: comparison of distinct pointer types lacks a castMichael Niedermayer2013-02-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: ensure that get_format() is called when changing format but not otherwise.Michael Niedermayer2013-02-211-5/+5
| | | | | | | | | | | | | | Fixes Ticket2288 Tested-by: Stefano Pigozzi <stefano.pigozzi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move next/last picture init to decode_slice_headerMichael Niedermayer2013-02-211-2/+5
| | | | | | | | | | | | | | | | This is a regression introduced from the h264/mpegvideo split Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Fix handling of changing reference counts between slicesMichael Niedermayer2013-02-201-1/+5
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: call alloc_scratch_buffers() only once linesize is knownMichael Niedermayer2013-02-201-17/+9
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'Michael Niedermayer2013-02-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0': h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil Conflicts: libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264_mb_template.c libavcodec/h264addpx_template.c libavcodec/h264dsp.c libavcodec/h264dsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputilRonald S. Bultje2013-02-191-7/+7
| | | | | | | | | | | | | | | | | | These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Martin Storsjö <martin@martin.st>
* | h264: integrate clear_blocks calls with IDCT.Ronald S. Bultje2013-02-191-7/+7
| | | | | | | | | | | | | | | | | | The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700 to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip tested (cathedral), i.e. almost 30 cycles per mb faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: put visualization and debug support backMichael Niedermayer2013-02-191-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | split out ff_hwaccel_pixfmt_list_420[] over individual codecs.Ronald S. Bultje2013-02-181-1/+18
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264/svq3: stop using draw_edges.Ronald S. Bultje2013-02-181-36/+6
| | | | | | | | | | | | | | | | | | | | | | Instead, only extend edges on-demand when the motion vector actually crosses the visible decoded area using ff_emulated_edge_mc(). This changes decoding time for cathedral from 8.722sec to 8.706sec, i.e. 0.2% faster overall. More generally (VP8 uses this also), low-motion content gets significant speed improvements, whereas high-motion content tends to decode in approximately the same time. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don't store intra pcm samples in h->mb.Ronald S. Bultje2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | Instead, keep them in the bitstream buffer until we read them verbatim, this saves a memcpy() and a subsequent clearing of the target buffer. decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from 6121.4 to 6095.5 cycles, i.e. 26 cycles faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don't initialize missing pictures when using VDPAU.Carl Eugen Hoyos2013-02-171-1/+2
| | | | | | | | | | | | This fixes an assertion failure when running mplayer -vc ffh264vdpau. Reported by irc user ioni.
* | h264: avoid calling get_format() multiple timesMichael Niedermayer2013-02-171-2/+8
| | | | | | | | | | | | | | | | | | | | Some applications do not like that. Fixes VDA Reduces noise for VDPAU Tested-by: Guillaume POIRIER <poirierg@gmail.com> Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don't initialize missing pictures when using a hwaccelHendrik Leppkes2013-02-171-1/+1
| | | | | | | | | | | | Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-161-774/+1103
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status