[FFmpeg-cvslog] Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 24 01:34:38 2011 +0200| [9c020810c1d04e2983fff9171104062f9471805a] | committer: Michael Niedermayer

Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"

This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91.

Conflicts:

	libavcodec/mpeg12.c
	libavcodec/mpeg12.h

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c020810c1d04e2983fff9171104062f9471805a
---

 libavcodec/mpeg12.c    |    8 ++++----
 libavcodec/mpeg12.h    |    1 -
 libavcodec/mpegvideo.h |    1 +
 libavcodec/vdpau.c     |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 68d4467..08d46d4 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -911,7 +911,7 @@ static int mpeg_decode_mb(Mpeg1Context *s1, DCTELEM block[12][64])
                             s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] =
                                 mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]);
                             /* full_pel: only for MPEG-1 */
-                            if (s1->full_pel[i]) {
+                            if (s->full_pel[i]) {
                                 s->mv[i][0][0] <<= 1;
                                 s->mv[i][0][1] <<= 1;
                             }
@@ -1363,7 +1363,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
 
     vbv_delay = get_bits(&s->gb, 16);
     if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) {
-        s1->full_pel[0] = get_bits1(&s->gb);
+        s->full_pel[0] = get_bits1(&s->gb);
         f_code = get_bits(&s->gb, 3);
         if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
             return -1;
@@ -1371,7 +1371,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
         s->mpeg_f_code[0][1] = f_code;
     }
     if (s->pict_type == AV_PICTURE_TYPE_B) {
-        s1->full_pel[1] = get_bits1(&s->gb);
+        s->full_pel[1] = get_bits1(&s->gb);
         f_code = get_bits(&s->gb, 3);
         if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
             return -1;
@@ -1519,7 +1519,7 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
 {
     MpegEncContext *s = &s1->mpeg_enc_ctx;
 
-    s1->full_pel[0] = s1->full_pel[1] = 0;
+    s->full_pel[0] = s->full_pel[1] = 0;
     s->mpeg_f_code[0][0] = get_bits(&s->gb, 4);
     s->mpeg_f_code[0][1] = get_bits(&s->gb, 4);
     s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 89db30b..9a9cc85 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -41,7 +41,6 @@ typedef struct Mpeg1Context {
     int save_width, save_height, save_progressive_seq;
     AVRational frame_rate_ext;       ///< MPEG-2 specific framerate modificator
     int sync;                        ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
-    int full_pel[2];
     int tmpgexs;
 } Mpeg1Context;
 
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index a8aef0c..13ea78d 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -638,6 +638,7 @@ typedef struct MpegEncContext {
     int chroma_y_shift;
 
     int progressive_frame;
+    int full_pel[2];
     int interlaced_dct;
     int first_slice;
     int first_field;         ///< is 1 for the first field of a field picture 0 otherwise
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 120c9dc..260d05d 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];