[SCM] libav/experimental: Update yuv4mpeg to use PIX_FMT_NONE patch by (Roine Gustafsson <roine users sourceforge net)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 93b2b333b98ce1fd83b226f59f79a7a3833f54cf
Author: Roine Gustafsson <roine at users.sourceforge.net>
Date:   Tue Apr 26 08:57:41 2005 +0000

    Update yuv4mpeg to use PIX_FMT_NONE patch by (Roine Gustafsson <roine users sourceforge net)
    
    Originally committed as revision 4163 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 2d36d07..3152c87 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -192,7 +192,7 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap)
     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 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap)
         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;

-- 
Libav/FFmpeg packaging