diff options
| author | Roine Gustafsson <roine@users.sourceforge.net> | 2005-04-26 08:57:41 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-04-26 08:57:41 +0000 |
| commit | 93b2b333b98ce1fd83b226f59f79a7a3833f54cf (patch) | |
| tree | 3e00038dc92be55df82df9127ddf5317e5fd6077 | |
| parent | 82c0c4ba785d2d98c3465e3fb0b25010dfb770ed (diff) | |
| download | ffmpeg-93b2b333b98ce1fd83b226f59f79a7a3833f54cf.tar.gz | |
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
| -rw-r--r-- | libavformat/yuv4mpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 2d36d07eb7..3152c87176 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; |