From 903a0acba46e66f3a7c3fd59e9ca14b38cfb731b Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 14 Sep 2014 21:23:44 -0300
Subject: [PATCH] avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/avformat.h | 10 ----------
 libavformat/mux.c      | 10 ----------
 libavformat/version.h  |  3 ---
 3 files changed, 23 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 78054debca..bab412ff64 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 55add43ebb..21e6a07723 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -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;
diff --git a/libavformat/version.h b/libavformat/version.h
index 90739a8759..28cd008f20 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -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