diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-10 22:57:51 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-10 22:57:51 +0000 |
| commit | 1968e438d00af0a264f8b16ce88b7a099eebe23f (patch) | |
| tree | ee27519a9db64ab3ad0e1233685baa241dfa6553 | |
| parent | 6f0b5d6fae3bcbd4791ecaa40f7016d29e4d0ea9 (diff) | |
| download | ffmpeg-1968e438d00af0a264f8b16ce88b7a099eebe23f.tar.gz | |
Use only MpegEncContext in ff_vdpau_h264_add_data_chunk.
Originally committed as revision 16520 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/vdpau_internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/vdpauvideo.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f5a8833fa0..310251d59a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7425,8 +7425,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ && avctx->skip_frame < AVDISCARD_ALL){ if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ static const uint8_t start_code[] = {0x00, 0x00, 0x01}; - ff_vdpau_h264_add_data_chunk(h, start_code, sizeof(start_code)); - ff_vdpau_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); + ff_vdpau_h264_add_data_chunk(s, start_code, sizeof(start_code)); + ff_vdpau_h264_add_data_chunk(s, &buf[buf_index - consumed], consumed ); }else context_count++; } diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index a989d89d29..8e120c30f8 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -27,7 +27,7 @@ #include <stdint.h> #include "h264.h" -void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf, +void ff_vdpau_h264_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); diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c index 248716ac20..e79fa5ac4a 100644 --- a/libavcodec/vdpauvideo.c +++ b/libavcodec/vdpauvideo.c @@ -106,10 +106,9 @@ void ff_vdpau_h264_set_reference_frames(H264Context *h) } } -void ff_vdpau_h264_add_data_chunk(H264Context *h, +void ff_vdpau_h264_add_data_chunk(MpegEncContext *s, const uint8_t *buf, int buf_size) { - MpegEncContext * s = &h->s; struct vdpau_render_state * render; render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; |