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

[stefano]

Author: stefano
Date: Fri Jan  1 13:46:24 2010
New Revision: 20991

Log:
Deprecate guess_format() in favor of av_guess_format().

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

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Fri Jan  1 13:29:22 2010	(r20990)
+++ trunk/libavformat/avformat.h	Fri Jan  1 13:46:24 2010	(r20991)
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 44
+#define LIBAVFORMAT_VERSION_MINOR 45
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -716,6 +716,13 @@ void av_register_output_format(AVOutputF
 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
 
 /**
@@ -730,7 +737,7 @@ attribute_deprecated AVOutputFormat *gue
  * @param mime_type if non-NULL checks if mime_type matches with the
  * MIME type of the registered formats
  */
-AVOutputFormat *guess_format(const char *short_name,
+AVOutputFormat *av_guess_format(const char *short_name,
                              const char *filename,
                              const char *mime_type);
 

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Fri Jan  1 13:29:22 2010	(r20990)
+++ trunk/libavformat/utils.c	Fri Jan  1 13:46:24 2010	(r20991)
@@ -182,9 +182,17 @@ static int match_format(const char *name
     return !strcasecmp(name, names);
 }
 
+#if LIBAVFORMAT_VERSION_MAJOR < 53
 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)
+{
     AVOutputFormat *fmt, *fmt_found;
     int score_max, score;