summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-10-15 12:45:14 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-15 12:45:14 +0000
commit198ac67fe843f55535b75bd3f17b3a1b7ee847b6 (patch)
tree303f52d0fbcf01fd1640b6158c639a65534c293f /libavformat/utils.c
parenta15c7fd6cb2055aa1d26c1cd3b241ce81cae5901 (diff)
add FF_API_GUESS_FORMAT define to disable the deprecated guess_format()
and guess_stream_format() public functions Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8a08557890..4060ca9ed8 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -189,7 +189,7 @@ static int match_format(const char *name, const char *names)
return !strcasecmp(name, names);
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_GUESS_FORMAT
AVOutputFormat *guess_format(const char *short_name, const char *filename,
const char *mime_type)
{
@@ -234,7 +234,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
return fmt_found;
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_GUESS_FORMAT
AVOutputFormat *guess_stream_format(const char *short_name, const char *filename,
const char *mime_type)
{