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

Remove H264Context from vdpau_internal.h.

Browse Source 
Originally committed as revision 16524 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos 2009-01-11 00:48:20 +00:00
parent 973c68cba0
commit 1717031362
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -7625,7 +7625,7 @@ static int decode_frame(AVCodecContext *avctx,
s->current_picture_ptr->pict_type= s->pict_type; s->current_picture_ptr->pict_type= s->pict_type;
if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
ff_vdpau_h264_set_reference_frames(h); ff_vdpau_h264_set_reference_frames(s);
if(!s->dropable) { if(!s->dropable) {
execute_ref_pic_marking(h, h->mmco, h->mmco_index); execute_ref_pic_marking(h, h->mmco, h->mmco_index);
@ -7636,7 +7636,7 @@ static int decode_frame(AVCodecContext *avctx,
h->prev_frame_num= h->frame_num; h->prev_frame_num= h->frame_num;
if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
ff_vdpau_h264_picture_complete(h); ff_vdpau_h264_picture_complete(s);
/* /*
* FIXME: Error handling code does not seem to support interlaced * FIXME: Error handling code does not seem to support interlaced

5
libavcodec/vdpau_internal.h
View File

@ -25,11 +25,10 @@
#define AVCODEC_VDPAU_INTERNAL_H #define AVCODEC_VDPAU_INTERNAL_H
#include <stdint.h> #include <stdint.h>
#include "h264.h"
void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf, void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
int buf_size); int buf_size);
void ff_vdpau_h264_set_reference_frames(H264Context *h); void ff_vdpau_h264_set_reference_frames(MpegEncContext *s);
void ff_vdpau_h264_picture_complete(H264Context *h); void ff_vdpau_h264_picture_complete(MpegEncContext *s);
#endif /* AVCODEC_VDPAU_INTERNAL_H */ #endif /* AVCODEC_VDPAU_INTERNAL_H */

8
libavcodec/vdpauvideo.c
View File

@ -37,9 +37,9 @@
* @{ * @{
*/ */
void ff_vdpau_h264_set_reference_frames(H264Context *h) void ff_vdpau_h264_set_reference_frames(MpegEncContext *s)
{ {
MpegEncContext * s = &h->s; H264Context *h = s->avctx->priv_data;
struct vdpau_render_state * render, * render_ref; struct vdpau_render_state * render, * render_ref;
VdpReferenceFrameH264 * rf, * rf2; VdpReferenceFrameH264 * rf, * rf2;
Picture * pic; Picture * pic;
@ -126,9 +126,9 @@ void ff_vdpau_add_data_chunk(MpegEncContext *s,
render->bitstream_buffers_used++; render->bitstream_buffers_used++;
} }
void ff_vdpau_h264_picture_complete(H264Context *h) void ff_vdpau_h264_picture_complete(MpegEncContext *s)
{ {
MpegEncContext * s = &h->s; H264Context *h = s->avctx->priv_data;
struct vdpau_render_state * render; struct vdpau_render_state * render;
render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; render = (struct vdpau_render_state*)s->current_picture_ptr->data[0];