Use only MpegEncContext in ff_vdpau_h264_add_data_chunk.
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sat, 10 Jan 2009 22:57:51 +0000 (22:57 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sat, 10 Jan 2009 22:57:51 +0000 (22:57 +0000)
Originally committed as revision 16520 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c
libavcodec/vdpau_internal.h
libavcodec/vdpauvideo.c

index f5a8833..310251d 100644 (file)
@@ -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++;
             }
index a989d89..8e120c3 100644 (file)
@@ -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);
index 248716a..e79fa5a 100644 (file)
@@ -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];