Mercurial > libavcodec.hg
changeset 8562:187862685e70 libavcodec
Use only MpegEncContext in ff_vdpau_h264_add_data_chunk.
| author | cehoyos |
|---|---|
| date | Sat, 10 Jan 2009 22:57:51 +0000 |
| parents | 2a8ad335df49 |
| children | b59279494d84 |
| files | h264.c vdpau_internal.h vdpauvideo.c |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Sat Jan 10 22:55:26 2009 +0000 +++ b/h264.c Sat Jan 10 22:57:51 2009 +0000 @@ -7425,8 +7425,8 @@ && 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++; }
--- a/vdpau_internal.h Sat Jan 10 22:55:26 2009 +0000 +++ b/vdpau_internal.h Sat Jan 10 22:57:51 2009 +0000 @@ -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);
--- a/vdpauvideo.c Sat Jan 10 22:55:26 2009 +0000 +++ b/vdpauvideo.c Sat Jan 10 22:57:51 2009 +0000 @@ -106,10 +106,9 @@ } } -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];