aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-04-25 18:29:06 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-04-25 18:29:06 +0000
commit644a92626a94d6f24110309cb2dc7d9ec3e79f25 (patch)
tree536101865dc2b937f4e4587909c299dc6f434b84 /libavformat/img2.c
parent3ca4b65479f587d5d79080699d16cdd5c9ec7e0a (diff)
downloadffmpeg-644a92626a94d6f24110309cb2dc7d9ec3e79f25.tar.gz
PIX_FMT_NONE and related fixes
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r--libavformat/img2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 0a53a5b824..0d58604beb 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -222,7 +222,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec.codec_type = CODEC_TYPE_VIDEO;
st->codec.codec_id = av_str2id(img_tags, s->path);
}
- if(st->codec.codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt)
+ if(st->codec.codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE)
st->codec.pix_fmt = ap->pix_fmt;
return 0;