[Ffmpeg-cvslog] CVS: ffmpeg/libavformat yuv4mpeg.c,1.19,1.20

[Michael Niedermayer CVS]

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

Modified Files:
	yuv4mpeg.c 
Log Message:
Update yuv4mpeg to use PIX_FMT_NONE patch by (Roine Gustafsson <roine users sourceforge net)


Index: yuv4mpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/yuv4mpeg.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- yuv4mpeg.c	19 Jan 2005 12:27:48 -0000	1.19
+++ yuv4mpeg.c	26 Apr 2005 08:57:41 -0000	1.20
@@ -192,7 +192,7 @@
     int i;
     ByteIOContext *pb = &s->pb;
     int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0,interlaced_frame=0,top_field_first=0;
-    enum PixelFormat pix_fmt=PIX_FMT_NB,alt_pix_fmt=PIX_FMT_NB;
+    enum PixelFormat pix_fmt=PIX_FMT_NONE,alt_pix_fmt=PIX_FMT_NONE;
     AVStream *st;
     
     for (i=0; i<MAX_YUV4_HEADER; i++) {
@@ -300,8 +300,8 @@
         return -1;        
     }
     
-    if (pix_fmt == PIX_FMT_NB) {
-        if (alt_pix_fmt == PIX_FMT_NB)
+    if (pix_fmt == PIX_FMT_NONE) {
+        if (alt_pix_fmt == PIX_FMT_NONE)
             pix_fmt = PIX_FMT_YUV420P;
         else
             pix_fmt = alt_pix_fmt;