# HG changeset patch # User stefano # Date 1234081000 0 # Node ID 61319d92bc360b7f5130ea12358a0de78fc7dce9 # Parent 7cf3b77ad6ff5783c7ce5f071d067dcb1e980d34 Deprecate av_malloc_format_context() in favor of avformat_alloc_context(), and drop the old symbol at the next major bump. diff -r 7cf3b77ad6ff -r 61319d92bc36 avformat.h --- a/avformat.h Sun Feb 08 05:12:30 2009 +0000 +++ b/avformat.h Sun Feb 08 08:16:40 2009 +0000 @@ -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 @@ 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 -r 7cf3b77ad6ff -r 61319d92bc36 options.c --- a/options.c Sun Feb 08 05:12:30 2009 +0000 +++ b/options.c Sun Feb 08 08:16:40 2009 +0000 @@ -72,7 +72,7 @@ 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 @@ 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