xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2014-09-14 21:23:44 -03:00
parent e524a9b1ff
commit 903a0acba4
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avformat.h
View File

@ -1874,16 +1874,6 @@ AVProgram *av_new_program(AVFormatContext *s, int id);
*/ */
#if FF_API_ALLOC_OUTPUT_CONTEXT
/**
* @deprecated deprecated in favor of avformat_alloc_output_context2()
*/
attribute_deprecated
AVFormatContext *avformat_alloc_output_context(const char *format,
AVOutputFormat *oformat,
const char *filename);
#endif
/** /**
* Allocate an AVFormatContext for an output format. * Allocate an AVFormatContext for an output format.
* avformat_free_context() can be used to free the context and * avformat_free_context() can be used to free the context and

10
libavformat/mux.c
View File

@ -171,16 +171,6 @@ error:
return ret; return ret;
} }
#if FF_API_ALLOC_OUTPUT_CONTEXT
AVFormatContext *avformat_alloc_output_context(const char *format,
AVOutputFormat *oformat, const char *filename)
{
AVFormatContext *avctx;
int ret = avformat_alloc_output_context2(&avctx, oformat, format, filename);
return ret < 0 ? NULL : avctx;
}
#endif
static int validate_codec_tag(AVFormatContext *s, AVStream *st) static int validate_codec_tag(AVFormatContext *s, AVStream *st)
{ {
const AVCodecTag *avctag; const AVCodecTag *avctag;

3
libavformat/version.h
View File

@ -61,9 +61,6 @@
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_FORMAT_PARAMETERS #ifndef FF_API_FORMAT_PARAMETERS
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56) #define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif #endif