[SCM] libav/experimental: add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated av_alloc_format_context() public function

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:17:42 UTC 2013


The following commit has been merged in the experimental branch:
commit ca51d86c96675aabf3f05c9052593b4bc8eb927f
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Oct 15 12:59:45 2010 +0000

    add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated
    av_alloc_format_context() public function
    
    Originally committed as revision 25483 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 655488c..0354f03 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -63,6 +63,9 @@
 #ifndef FF_API_URL_SPLIT
 #define FF_API_URL_SPLIT          (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_ALLOC_FORMAT_CONTEXT
+#define FF_API_ALLOC_FORMAT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got
@@ -1071,7 +1074,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
                        int buf_size,
                        AVFormatParameters *ap);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_ALLOC_FORMAT_CONTEXT
 /**
  * @deprecated Use avformat_alloc_context() instead.
  */
diff --git a/libavformat/options.c b/libavformat/options.c
index cba6436..27eb8da 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -89,7 +89,7 @@ AVFormatContext *avformat_alloc_context(void)
     return ic;
 }
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_ALLOC_FORMAT_CONTEXT
 AVFormatContext *av_alloc_format_context(void)
 {
     return avformat_alloc_context();

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list