diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-19 09:28:45 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-23 14:14:39 +0200 |
| commit | da22ba7df461c13bf0b0eabc953303803a285d91 (patch) | |
| tree | a21067830f6440cad22a15cf67438704de8e53bf /libavcodec/vdpau.c | |
| parent | cc05a45d339d57214d647f5e01e91491c78a0b24 (diff) | |
| download | ffmpeg-da22ba7df461c13bf0b0eabc953303803a285d91.tar.gz | |
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
It's MPEG-1 specific.
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index df04ca01fc..2a7894edd2 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -190,9 +190,10 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s) render->bitstream_buffers_used = 0; } -void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, +void ff_vdpau_mpeg_picture_complete(Mpeg1Context *s1, const uint8_t *buf, int buf_size, int slice_count) { + MpegEncContext *s = &s1->mpeg_enc_ctx; struct vdpau_render_state *render, *last, *next; int i; @@ -211,8 +212,8 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, render->info.mpeg.alternate_scan = s->alternate_scan; render->info.mpeg.q_scale_type = s->q_scale_type; render->info.mpeg.top_field_first = s->top_field_first; - render->info.mpeg.full_pel_forward_vector = s->full_pel[0]; // MPEG-1 only. Set 0 for MPEG-2 - render->info.mpeg.full_pel_backward_vector = s->full_pel[1]; // MPEG-1 only. Set 0 for MPEG-2 + render->info.mpeg.full_pel_forward_vector = s1->full_pel[0]; // MPEG-1 only. Set 0 for MPEG-2 + render->info.mpeg.full_pel_backward_vector = s1->full_pel[1]; // MPEG-1 only. Set 0 for MPEG-2 render->info.mpeg.f_code[0][0] = s->mpeg_f_code[0][0]; // For MPEG-1 fill both horiz. & vert. render->info.mpeg.f_code[0][1] = s->mpeg_f_code[0][1]; render->info.mpeg.f_code[1][0] = s->mpeg_f_code[1][0]; |