diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:34:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:48:51 +0200 |
| commit | 9c020810c1d04e2983fff9171104062f9471805a (patch) | |
| tree | 74e9ef92ecc467fe9aac35bccecaded622e14651 /libavcodec/vdpau.c | |
| parent | fe906830fd58cd281bc94c59081f66074ea69dff (diff) | |
| download | ffmpeg-9c020810c1d04e2983fff9171104062f9471805a.tar.gz | |
Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"
This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 120c9dcf82..260d05d906 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -212,8 +212,8 @@ void ff_vdpau_mpeg_picture_complete(Mpeg1Context *s1, 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 = 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.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.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]; |