summaryrefslogtreecommitdiffstats
path: root/libavformat/utils.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/utils.c
parent7481e91982c45c22a650fd6d2bc3449edea6b634 (diff)
downloadffmpeg-streaming-94d883e84b1d4d2437ca4e5b9ff25c43cc9ef06e.zip
ffmpeg-streaming-94d883e84b1d4d2437ca4e5b9ff25c43cc9ef06e.tar.gz
jpeg detection fix - fixed imagepipe output
Originally committed as revision 1443 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2defc31..0db7403 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -86,7 +86,9 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename,
int score_max, score;
/* specific test for image sequences */
- if (!short_name && filename && filename_number_test(filename) >= 0) {
+ if (!short_name && filename &&
+ filename_number_test(filename) >= 0 &&
+ guess_image_format(filename)) {
return guess_format("image", NULL, NULL);
}
OpenPOWER on IntegriCloud