virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/format: simplify ifdeffery

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-29 21:33:10 +02:00
parent 58eaa95116
commit 6d69503883
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/format.c
View File

@@ -272,9 +272,7 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
#if FF_API_PROBE_MIME #if FF_API_PROBE_MIME
if (pb->av_class) if (pb->av_class)
av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type); av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type);
#endif #else
#if !FF_API_PROBE_MIME
if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) { 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")) { if (!av_strcasecmp(mime_type, "audio/aacp")) {
*fmt = av_find_input_format("aac"); *fmt = av_find_input_format("aac");