ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jul 29 21:33:10 2014 +0200| [6d69503883dad9bc6526965fb6180c85b8c55e7f] | committer: Michael Niedermayer
avformat/format: simplify ifdeffery Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d69503883dad9bc6526965fb6180c85b8c55e7f --- libavformat/format.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/format.c b/libavformat/format.c index 28dd672..231efcf 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -272,9 +272,7 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, #if FF_API_PROBE_MIME if (pb->av_class) av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type); -#endif - -#if !FF_API_PROBE_MIME +#else if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { if (!av_strcasecmp(mime_type, "audio/aacp")) { *fmt = av_find_input_format("aac"); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
