generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jpeg detection fix - fixed imagepipe output

Browse Source 
Originally committed as revision 1443 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-01-11 05:33:35 +00:00
parent 7481e91982
commit 94d883e84b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/img.c
View File

@ -47,7 +47,7 @@ int emulate_frame_rate;
static int image_probe(AVProbeData *p) 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; return AVPROBE_SCORE_MAX;
else else
return 0; return 0;
@ -358,7 +358,7 @@ static AVOutputFormat imagepipe_oformat = {
img_write_header, img_write_header,
img_write_packet, img_write_packet,
img_write_trailer, img_write_trailer,
AVFMT_NEEDNUMBER | AVFMT_RAWPICTURE, AVFMT_RAWPICTURE,
img_set_parameters, img_set_parameters,
}; };

4
libavformat/utils.c
View File

@ -86,7 +86,9 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename,
int score_max, score; int score_max, score;
/* specific test for image sequences */ /* 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); return guess_format("image", NULL, NULL);
} }