generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate av_malloc_format_context() in favor of

Browse Source 
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
This commit is contained in:
Stefano Sabatini 2009-02-08 08:16:40 +00:00
parent 353f87b8d4
commit 88a2896520
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/avformat.h
View File

@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 25 #define LIBAVFORMAT_VERSION_MINOR 26
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #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, AVInputFormat *fmt,
int buf_size, int buf_size,
AVFormatParameters *ap); 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. * Allocate an AVFormatContext.
* Can be freed with av_free() but do not forget to free everything you * Can be freed with av_free() but do not forget to free everything you
* explicitly allocated as well! * 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 * Read packets of a media file to get stream information. This

9
libavformat/options.c
View File

@ -72,7 +72,7 @@ static void avformat_get_context_defaults(AVFormatContext *s)
av_opt_set_defaults(s); av_opt_set_defaults(s);
} }
AVFormatContext *av_alloc_format_context(void) AVFormatContext *avformat_alloc_context(void)
{ {
AVFormatContext *ic; AVFormatContext *ic;
ic = av_malloc(sizeof(AVFormatContext)); ic = av_malloc(sizeof(AVFormatContext));
@ -81,3 +81,10 @@ AVFormatContext *av_alloc_format_context(void)
ic->av_class = &av_format_context_class; ic->av_class = &av_format_context_class;
return ic; return ic;
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53
AVFormatContext *av_alloc_format_context(void)
{
return avformat_alloc_context();
}
#endif