diff options
author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-10 02:45:07 +0000 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-10 02:45:07 +0000 |
commit | 7fd3c09e0f6560b72e2340f100886352eb9fc15d (patch) | |
tree | 462ebd217057b3d2c8cbc229a4d9ccab2fe9254b /libavcodec/h264.c | |
parent | 1a1078faa4217c32394a931865ed4b7a3cce634e (diff) | |
download | ffmpeg-streaming-7fd3c09e0f6560b72e2340f100886352eb9fc15d.zip ffmpeg-streaming-7fd3c09e0f6560b72e2340f100886352eb9fc15d.tar.gz |
Move vdpau_h264_set_reference_frames() call from vdpauvideo.c into h264.c.
Originally committed as revision 16513 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a8bd062..f5a8833 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7624,6 +7624,9 @@ static int decode_frame(AVCodecContext *avctx, s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; s->current_picture_ptr->pict_type= s->pict_type; + if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) + ff_vdpau_h264_set_reference_frames(h); + if(!s->dropable) { execute_ref_pic_marking(h, h->mmco, h->mmco_index); h->prev_poc_msb= h->poc_msb; |