summaryrefslogtreecommitdiff
path: root/libavformat/img.c
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2003-01-11 05:33:35 +0000
committerFabrice Bellard <fabrice@bellard.org>2003-01-11 05:33:35 +0000
commit94d883e84b1d4d2437ca4e5b9ff25c43cc9ef06e (patch)
treefdca1c3dd96bc09c20f5d6490534ec8d5ab38b7e /libavformat/img.c
parent7481e91982c45c22a650fd6d2bc3449edea6b634 (diff)
jpeg detection fix - fixed imagepipe output
Originally committed as revision 1443 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img.c')
-rw-r--r--libavformat/img.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/img.c b/libavformat/img.c
index 70f6307d4d..139e0f48af 100644
--- a/libavformat/img.c
+++ b/libavformat/img.c
@@ -47,7 +47,7 @@ int emulate_frame_rate;
static int image_probe(AVProbeData *p)
{
- if (filename_number_test(p->filename) >= 0)
+ if (filename_number_test(p->filename) >= 0 && guess_image_format(p->filename))
return AVPROBE_SCORE_MAX;
else
return 0;
@@ -358,7 +358,7 @@ static AVOutputFormat imagepipe_oformat = {
img_write_header,
img_write_packet,
img_write_trailer,
- AVFMT_NEEDNUMBER | AVFMT_RAWPICTURE,
+ AVFMT_RAWPICTURE,
img_set_parameters,
};