aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2003-08-24 21:21:10 +0000
committerFabrice Bellard <fabrice@bellard.org>2003-08-24 21:21:10 +0000
commit44664b0915ac4920943955ef7f5c0ffd5eecbf30 (patch)
treefc41c4827ff4b291d2486589771530d22762cdcd /libavformat
parent22b37f5d3200cfe4c15eded883663cf0612093c1 (diff)
downloadffmpeg-44664b0915ac4920943955ef7f5c0ffd5eecbf30.tar.gz
accepts pgmyuv extension
Originally committed as revision 2152 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/pnm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/pnm.c b/libavformat/pnm.c
index 2161faf069..a831e212d2 100644
--- a/libavformat/pnm.c
+++ b/libavformat/pnm.c
@@ -395,7 +395,7 @@ static int pnm_probe(AVProbeData *pd)
p[0] == 'P' &&
p[1] >= '4' && p[1] <= '6' &&
p[2] == '\n')
- return AVPROBE_SCORE_MAX;
+ return AVPROBE_SCORE_MAX - 1; /* to permit pgmyuv probe */
else
return 0;
}
@@ -468,7 +468,7 @@ AVImageFormat pam_image_format = {
AVImageFormat pgmyuv_image_format = {
"pgmyuv",
- NULL,
+ "pgmyuv",
pgmyuv_probe,
pgmyuv_read,
(1 << PIX_FMT_YUV420P),