diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:42 +0100 |
| commit | 64f6f6f83662f0a307b3d59d6c0672e0aae96830 (patch) | |
| tree | 719f24af7464aa7590bd2750007964c821384a3e | |
| parent | 21824e5b88c4f5796e47847c0331bae223a21e49 (diff) | |
| download | ffmpeg-64f6f6f83662f0a307b3d59d6c0672e0aae96830.tar.gz | |
lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/img2.c | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index fe2b0cfdb7..d71ae2ff6b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1191,10 +1191,6 @@ AVProgram *av_new_program(AVFormatContext *s, int id); */ -#if FF_API_GUESS_IMG2_CODEC -attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename); -#endif - /** * @addtogroup lavf_decoding * @{ diff --git a/libavformat/img2.c b/libavformat/img2.c index 7203cb62d9..4ff47670a5 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -199,12 +199,6 @@ enum CodecID ff_guess_image2_codec(const char *filename) return av_str2id(img_tags, filename); } -#if FF_API_GUESS_IMG2_CODEC -enum CodecID av_guess_image2_codec(const char *filename){ - return av_str2id(img_tags, filename); -} -#endif - static int read_header(AVFormatContext *s1) { VideoData *s = s1->priv_data; diff --git a/libavformat/version.h b/libavformat/version.h index 097fdaa427..5279f9722b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. */ -#ifndef FF_API_GUESS_IMG2_CODEC -#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_SDP_CREATE #define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |