[SCM] libav/experimental: Deprecate guess_format() in favor of av_guess_format().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a1f547b94a89b7d39a7dc583b048052d4d8a50e3
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Fri Jan 1 12:46:24 2010 +0000

    Deprecate guess_format() in favor of av_guess_format().
    
    Originally committed as revision 20991 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1d05b0b..7fc10a3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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(AVOutputFormat *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
 
 /**
@@ -730,7 +737,7 @@ attribute_deprecated AVOutputFormat *guess_stream_format(const char *short_name,
  * @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);
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5eb360c..79c5a1d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -182,9 +182,17 @@ static int match_format(const char *name, const char *names)
     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;
 

-- 
Libav/FFmpeg packaging