diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 21:33:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 21:33:10 +0200 |
| commit | 6d69503883dad9bc6526965fb6180c85b8c55e7f (patch) | |
| tree | 78294178c5726807fea452e1226aaae73c830b91 /libavformat | |
| parent | 58eaa95116d914c8de303893ddf9fa9b11803b3f (diff) | |
| download | ffmpeg-6d69503883dad9bc6526965fb6180c85b8c55e7f.tar.gz | |
avformat/format: simplify ifdeffery
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/format.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/format.c b/libavformat/format.c index 28dd672e94..231efcf4db 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"); |