diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-11 00:48:20 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-11 00:48:20 +0000 |
| commit | 17170313628920d8f2bf046c5a33e4afb6a985d3 (patch) | |
| tree | 47799c82da73756c2202f870f3aa6b9686a6b764 | |
| parent | 973c68cba0fd31199d4fb5cdb760107b3f83393b (diff) | |
Remove H264Context from vdpau_internal.h.
Originally committed as revision 16524 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/vdpau_internal.h | 5 | ||||
| -rw-r--r-- | libavcodec/vdpauvideo.c | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 400dca9de6..09e8938fbd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7625,7 +7625,7 @@ static int decode_frame(AVCodecContext *avctx, 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); + ff_vdpau_h264_set_reference_frames(s); if(!s->dropable) { 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; 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 diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 83911190b4..9a4989009e 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -25,11 +25,10 @@ #define AVCODEC_VDPAU_INTERNAL_H #include <stdint.h> -#include "h264.h" void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf, int buf_size); -void ff_vdpau_h264_set_reference_frames(H264Context *h); -void ff_vdpau_h264_picture_complete(H264Context *h); +void ff_vdpau_h264_set_reference_frames(MpegEncContext *s); +void ff_vdpau_h264_picture_complete(MpegEncContext *s); #endif /* AVCODEC_VDPAU_INTERNAL_H */ diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c index 8271bfe8f4..e0cd627f97 100644 --- a/libavcodec/vdpauvideo.c +++ b/libavcodec/vdpauvideo.c @@ -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; VdpReferenceFrameH264 * rf, * rf2; Picture * pic; @@ -126,9 +126,9 @@ void ff_vdpau_add_data_chunk(MpegEncContext *s, 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; render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; |