mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
e524a9b1ff
commit
903a0acba4
@ -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.
|
||||
* avformat_free_context() can be used to free the context and
|
||||
|
@ -171,16 +171,6 @@ error:
|
||||
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)
|
||||
{
|
||||
const AVCodecTag *avctag;
|
||||
|
@ -61,9 +61,6 @@
|
||||
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
|
||||
#endif
|
||||
|
||||
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
|
||||
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
|
||||
#endif
|
||||
#ifndef FF_API_FORMAT_PARAMETERS
|
||||
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user