diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:38:05 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | 61573bf1ba50dc8828d0e87d913389fbcff48509 (patch) | |
| tree | 704788b84db8de55c9c0efd8acbc688fc9b7020b | |
| parent | dcd4a7b62f16793c33fa459889e581286d6ccdd6 (diff) | |
lavf: remove FF_API_GUESS_FORMAT cruft
| -rw-r--r-- | libavformat/avformat.h | 12 | ||||
| -rw-r--r-- | libavformat/utils.c | 29 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 44 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f3e4fe4842..dae56c6037 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -862,18 +862,6 @@ attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename); /* utils.c */ void av_register_input_format(AVInputFormat *format); void av_register_output_format(AVOutputFormat *format); -#if FF_API_GUESS_FORMAT -attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name, - const char *filename, - const char *mime_type); - -/** - * @deprecated Use av_guess_format() instead. - */ -attribute_deprecated AVOutputFormat *guess_format(const char *short_name, - const char *filename, - const char *mime_type); -#endif /** * Return the output format in the list of registered output formats diff --git a/libavformat/utils.c b/libavformat/utils.c index cf8f9fae63..80700d4b2b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -200,14 +200,6 @@ static int match_format(const char *name, const char *names) return !strcasecmp(name, names); } -#if FF_API_GUESS_FORMAT -AVOutputFormat *guess_format(const char *short_name, const char *filename, - const char *mime_type) -{ - return av_guess_format(short_name, filename, mime_type); -} -#endif - AVOutputFormat *av_guess_format(const char *short_name, const char *filename, const char *mime_type) { @@ -243,27 +235,6 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, return fmt_found; } -#if FF_API_GUESS_FORMAT -AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, - const char *mime_type) -{ - AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type); - - if (fmt) { - AVOutputFormat *stream_fmt; - char stream_format_name[64]; - - snprintf(stream_format_name, sizeof(stream_format_name), "%s_stream", fmt->name); - stream_fmt = av_guess_format(stream_format_name, NULL, NULL); - - if (stream_fmt) - fmt = stream_fmt; - } - - return fmt; -} -#endif - enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum AVMediaType type){ if(type == AVMEDIA_TYPE_VIDEO){ diff --git a/libavformat/version.h b/libavformat/version.h index ef253599e4..182bfb7814 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_URL_CLASS #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #endif -#ifndef FF_API_GUESS_FORMAT -#define FF_API_GUESS_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_UDP_GET_FILE #define FF_API_UDP_GET_FILE (LIBAVFORMAT_VERSION_MAJOR < 53) #endif |