diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8e8ab91b2d..a71993708f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -712,9 +712,11 @@ 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); -AVOutputFormat *guess_stream_format(const char *short_name, +#if LIBAVFORMAT_VERSION_MAJOR < 53 +attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, const char *mime_type); +#endif AVOutputFormat *guess_format(const char *short_name, const char *filename, const char *mime_type); diff --git a/libavformat/utils.c b/libavformat/utils.c index d7241f59a7..5eb360c229 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -219,6 +219,7 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename, return fmt_found; } +#if LIBAVFORMAT_VERSION_MAJOR < 53 AVOutputFormat *guess_stream_format(const char *short_name, const char *filename, const char *mime_type) { @@ -237,6 +238,7 @@ AVOutputFormat *guess_stream_format(const char *short_name, const char *filename return fmt; } +#endif enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum CodecType type){ |