[FFmpeg-cvslog] r25480 - in trunk/libavformat: avformat.h utils.c

[aurel]

Author: aurel
Date: Fri Oct 15 14:45:14 2010
New Revision: 25480

Log:
add FF_API_GUESS_FORMAT define to disable the deprecated guess_format()
and guess_stream_format() public functions

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/utils.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Fri Oct 15 11:41:20 2010	(r25479)
+++ trunk/libavformat/avformat.h	Fri Oct 15 14:45:14 2010	(r25480)
@@ -54,6 +54,9 @@
 #ifndef FF_API_REGISTER_PROTOCOL
 #define FF_API_REGISTER_PROTOCOL  (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_GUESS_FORMAT
+#define FF_API_GUESS_FORMAT       (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got
@@ -898,7 +901,7 @@ enum CodecID av_guess_image2_codec(const
 /* utils.c */
 void av_register_input_format(AVInputFormat *format);
 void av_register_output_format(AVOutputFormat *format);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_GUESS_FORMAT
 attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
                                     const char *filename,
                                     const char *mime_type);

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Fri Oct 15 11:41:20 2010	(r25479)
+++ trunk/libavformat/utils.c	Fri Oct 15 14:45:14 2010	(r25480)
@@ -189,7 +189,7 @@ static int match_format(const char *name
     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 ch
     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)
 {