From 24e87f7f425a52b1e69661dcb2fbe0555a76f30b Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 6 Aug 2014 19:58:57 +0000
Subject: Remove obsolete FF_API_PROBE_MIME cruft.

---
 libavformat/format.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libavformat/format.c')

diff --git a/libavformat/format.c b/libavformat/format.c
index 93829ae072..bdc90446fa 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -195,10 +195,8 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened,
             if (av_match_ext(lpd.filename, fmt1->extensions))
                 score = AVPROBE_SCORE_EXTENSION;
         }
-#ifdef 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;
@@ -256,10 +254,8 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
         return AVERROR(EINVAL);
     avio_skip(pb, offset);
     max_probe_size -= offset;
-#ifdef FF_API_PROBE_MIME
     if (pb->av_class)
         av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type);
-#endif
     for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt;
          probe_size = FFMIN(probe_size << 1,
                             FFMAX(max_probe_size, probe_size + 1))) {
@@ -305,8 +301,6 @@ fail:
         (ret = ffio_rewind_with_probe_data(pb, buf, pd.buf_size)) < 0) {
         av_free(buf);
     }
-#ifdef FF_API_PROBE_MIME
     av_free(pd.mime_type);
-#endif
     return ret;
 }
-- 
cgit v1.2.1