[SCM] libav/experimental: Deprecate av_malloc_format_context() in favor of avformat_alloc_context(), and drop the old symbol at the next major bump.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 88a2896520f667461e7e9ef089d17954fe4ff1d2
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Feb 8 08:16:40 2009 +0000

    Deprecate av_malloc_format_context() in favor of
    avformat_alloc_context(), and drop the old symbol at the next major
    bump.
    
    Originally committed as revision 17047 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 77745ba..4201254 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 25
+#define LIBAVFORMAT_VERSION_MINOR 26
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -813,12 +813,20 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
                        AVInputFormat *fmt,
                        int buf_size,
                        AVFormatParameters *ap);
+
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+/**
+ * @deprecated Use avformat_alloc_context() instead.
+ */
+attribute_deprecated AVFormatContext *av_alloc_format_context(void);
+#endif
+
 /**
  * Allocate an AVFormatContext.
  * Can be freed with av_free() but do not forget to free everything you
  * explicitly allocated as well!
  */
-AVFormatContext *av_alloc_format_context(void);
+AVFormatContext *avformat_alloc_context(void);
 
 /**
  * Read packets of a media file to get stream information. This
diff --git a/libavformat/options.c b/libavformat/options.c
index 6f6ffe4..2063444 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -72,7 +72,7 @@ static void avformat_get_context_defaults(AVFormatContext *s)
     av_opt_set_defaults(s);
 }
 
-AVFormatContext *av_alloc_format_context(void)
+AVFormatContext *avformat_alloc_context(void)
 {
     AVFormatContext *ic;
     ic = av_malloc(sizeof(AVFormatContext));
@@ -81,3 +81,10 @@ AVFormatContext *av_alloc_format_context(void)
     ic->av_class = &av_format_context_class;
     return ic;
 }
+
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+AVFormatContext *av_alloc_format_context(void)
+{
+    return avformat_alloc_context();
+}
+#endif

-- 
Libav/FFmpeg packaging