avoid copying input when encoding non intra stuff too

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

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 7937be4..0d56954 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -470,16 +470,16 @@ int MPV_encode_picture(AVCodecContext *avctx,
             h >>= 1;
         }
 
-       if(s->intra_only && dest_wrap==src_wrap){
-           s->current_picture[i] = pict->data[i];
+       if(dest_wrap==src_wrap){
+           s->new_picture[i] = pict->data[i];
        }else {
             for(j=0;j<h;j++) {
                 memcpy(dest, src, w);
                 dest += dest_wrap;
                 src += src_wrap;
             }
+            s->new_picture[i] = s->current_picture[i];
        }
-        s->new_picture[i] = s->current_picture[i];
     }
 
     encode_picture(s, s->picture_number);