diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-08-06 19:58:57 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-08-09 16:59:21 +0000 |
| commit | 24e87f7f425a52b1e69661dcb2fbe0555a76f30b (patch) | |
| tree | 5397acf11955b0418628fc7b68ae247d008decc5 /libavformat | |
| parent | 472f9ed312ec784f7c72876b77163f4741880d05 (diff) | |
| download | ffmpeg-24e87f7f425a52b1e69661dcb2fbe0555a76f30b.tar.gz | |
Remove obsolete FF_API_PROBE_MIME cruft.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/format.c | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ab2081a3ef..2948d40490 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -391,9 +391,7 @@ typedef struct AVProbeData { const char *filename; unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */ int buf_size; /**< Size of buf except extra allocated bytes */ -#ifdef FF_API_PROBE_MIME uint8_t *mime_type; /**< mime_type, when known. */ -#endif } AVProbeData; #define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension 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; } diff --git a/libavformat/version.h b/libavformat/version.h index 89f4ba10e3..5eb9249c78 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -61,8 +61,4 @@ #define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 57) #endif -#ifndef FF_API_PROBE_MIME -#define FF_API_PROBE_MIME (LIBAVFORMAT_VERSION_MAJOR > 55) -#endif - #endif /* AVFORMAT_VERSION_H */ |