diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:36:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:36:21 +0200 |
| commit | c218d8218d95684c5e1b4c09ed0f258457f0ae7c (patch) | |
| tree | e6595772cb2eb12b746a945a9d5a5ccd40982c87 | |
| parent | 0f7ca2d77893c87d3c6e008520f6b5549f410387 (diff) | |
| parent | 24e87f7f425a52b1e69661dcb2fbe0555a76f30b (diff) | |
| download | ffmpeg-c218d8218d95684c5e1b4c09ed0f258457f0ae7c.tar.gz | |
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
Remove obsolete FF_API_PROBE_MIME cruft.
Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/format.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7551f7b548..9a7672f9e0 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -393,9 +393,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 */ -#if FF_API_PROBE_MIME uint8_t *mime_type; /**< mime_type, when known. */ -#endif } AVProbeData; #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4) diff --git a/libavformat/format.c b/libavformat/format.c index 1c25d6b933..999e8216da 100644 --- 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; } diff --git a/libavformat/version.h b/libavformat/version.h index c40c0c9819..9686a58ccc 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -88,8 +88,4 @@ #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif -#ifndef FF_API_PROBE_MIME -#define FF_API_PROBE_MIME (LIBAVFORMAT_VERSION_MAJOR > 55) -#endif - #endif /* AVFORMAT_VERSION_H */ |