Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

[ffmpeg] / libavformat / format.c

diff --git a/libavformat/format.c b/libavformat/format.c
index 1c25d6b933cb72c6c55e1392cb0a03b4f9e0771f..999e8216da65724354514210c0dc1e0330e599ab 100644 (file)
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -216,10 +216,8 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
             if (av_match_ext(lpd.filename, fmt1->extensions))
                 score = AVPROBE_SCORE_EXTENSION;
         }
-#if FF_API_PROBE_MIME
         if (av_match_name(lpd.mime_type, fmt1->mime_type))
             score = FFMAX(score, AVPROBE_SCORE_EXTENSION);
-#endif
         if (score > score_max) {
             score_max = score;
             fmt       = fmt1;
@@ -272,10 +270,9 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
     if (offset >= max_probe_size)
         return AVERROR(EINVAL);
 
-#if FF_API_PROBE_MIME
     if (pb->av_class)
         av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type);
-#else
+#if 0
     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");
@@ -338,9 +335,7 @@ fail:
     if (ret >= 0)
         ret = ret2;
 
-#if FF_API_PROBE_MIME
     av_free(pd.mime_type);
-#endif
     return ret < 0 ? ret : score;
 }