fixing epzs & mpeg1 (hopefully now really ...)

Originally committed as revision 348 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 3 insertions, 4 deletions

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index eb963fd4d0..180addb6f6 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -174,7 +174,7 @@ int MPV_common_init(MpegEncContext *s)
         }
     }
     
-    if (s->out_format == FMT_H263 || s->encoding) {
+    if (s->out_format == FMT_H263) {
         int size;
         /* MV prediction */
         size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
@@ -961,9 +961,8 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
     else if (s->h263_pred || s->h263_aic)
         s->mbintra_table[mb_x + mb_y*s->mb_width]=1;
 
-    /* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame 
-       motion_val is needed for encodig too, as the ME needs it */
-    if (s->out_format == FMT_H263 || s->encoding) {
+    /* update motion predictor, not for B-frames as they need the motion_val from the last P/S-Frame */
+    if (s->out_format == FMT_H263) {
       if(s->pict_type!=B_TYPE){
         int xy, wrap, motion_x, motion_y;