[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.373,1.374

[Luca Abeni CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv24909

Modified Files:
	ffmpeg.c 
Log Message:
Change img_convert() from img_fmt to img_fmt with img_copy()


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- ffmpeg.c	15 Mar 2006 07:16:16 -0000	1.373
+++ ffmpeg.c	29 Mar 2006 08:25:09 -0000	1.374
@@ -626,13 +626,7 @@
                 picture2 = picture;
             }
         } else {
-            if (img_convert(picture2, dec->pix_fmt, picture,
-                            dec->pix_fmt, dec->width, dec->height) < 0) {
-                /* if error, do not copy */
-                av_free(buf);
-                buf = NULL;
-                picture2 = picture;
-            }
+            img_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
         }
     } else {
         picture2 = picture;