From 114c9a592519358a16a6b2b4c8de24cdcb964961 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Fri, 15 Oct 2010 14:25:36 +0000
Subject: [PATCH] add FF_API_FIRST_FORMAT define to drop deprecated
 first_?format from public api

Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/avformat.h | 5 ++++-
 libavformat/utils.c    | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 41063d64c3..0ab1156881 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -78,6 +78,9 @@
 #ifndef FF_API_PARAMETERS_CODEC_ID
 #define FF_API_PARAMETERS_CODEC_ID     (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_FIRST_FORMAT
+#define FF_API_FIRST_FORMAT            (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got
@@ -895,7 +898,7 @@ typedef struct AVPacketList {
     struct AVPacketList *next;
 } AVPacketList;
 
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_FIRST_FORMAT
 attribute_deprecated extern AVInputFormat *first_iformat;
 attribute_deprecated extern AVOutputFormat *first_oformat;
 #endif
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 56bcfc09b4..be475cce7e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -110,8 +110,14 @@ static void av_frac_add(AVFrac *f, int64_t incr)
 }
 
 /** head of registered input format linked list */
+#if !FF_API_FIRST_FORMAT
+static
+#endif
 AVInputFormat *first_iformat = NULL;
 /** head of registered output format linked list */
+#if !FF_API_FIRST_FORMAT
+static
+#endif
 AVOutputFormat *first_oformat = NULL;
 
 AVInputFormat  *av_iformat_next(AVInputFormat  *f)