generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move vdpau_h264_set_reference_frames() call from vdpauvideo.c into h264.c.

Browse Source 
Originally committed as revision 16513 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos 2009-01-10 02:45:07 +00:00
parent 1a1078faa4
commit 7fd3c09e0f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264.c
View File

@ -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;

1
libavcodec/vdpau_internal.h
View File

@ -29,6 +29,7 @@
void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf,
int buf_size);
void ff_vdpau_h264_set_reference_frames(H264Context *h);
void ff_vdpau_h264_picture_complete(H264Context *h);
#endif /* AVCODEC_VDPAU_INTERNAL_H */

5
libavcodec/vdpauvideo.c
View File

@ -37,7 +37,7 @@
* @{
*/
static void vdpau_h264_set_reference_frames(H264Context *h)
void ff_vdpau_h264_set_reference_frames(H264Context *h)
{
MpegEncContext * s = &h->s;
struct vdpau_render_state * render, * render_ref;
@ -114,9 +114,6 @@ void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si
render = (struct vdpau_render_state*)s->current_picture_ptr->data[0];
assert(render);
if (!render->bitstream_buffers_used)
vdpau_h264_set_reference_frames(h);
render->bitstream_buffers= av_fast_realloc(
render->bitstream_buffers,
&render->bitstream_buffers_allocated,