|
|
@ -218,7 +218,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, |
|
|
|
#if CONFIG_IMAGE2_MUXER |
|
|
|
#if CONFIG_IMAGE2_MUXER |
|
|
|
if (!short_name && filename && |
|
|
|
if (!short_name && filename && |
|
|
|
av_filename_number_test(filename) && |
|
|
|
av_filename_number_test(filename) && |
|
|
|
av_guess_image2_codec(filename) != CODEC_ID_NONE) { |
|
|
|
ff_guess_image2_codec(filename) != CODEC_ID_NONE) { |
|
|
|
return av_guess_format("image2", NULL, NULL); |
|
|
|
return av_guess_format("image2", NULL, NULL); |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
#endif |
|
|
@ -271,7 +271,7 @@ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, |
|
|
|
|
|
|
|
|
|
|
|
#if CONFIG_IMAGE2_MUXER |
|
|
|
#if CONFIG_IMAGE2_MUXER |
|
|
|
if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ |
|
|
|
if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ |
|
|
|
codec_id= av_guess_image2_codec(filename); |
|
|
|
codec_id= ff_guess_image2_codec(filename); |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
if(codec_id == CODEC_ID_NONE) |
|
|
|
if(codec_id == CODEC_ID_NONE) |
|
|
|