From 072e3efd1b0ca3c5d08fa2119e88fb36b5708592 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Tue, 17 Aug 2010 19:30:21 +0000
Subject: add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS
 API

Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/avformat.h | 6 +++++-
 libavformat/mpegts.c   | 2 +-
 libavformat/nutdec.c   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index a6c40ad8b7..3715d848e4 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -35,6 +35,10 @@
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 
+#ifndef LAVF_API_MAX_STREAMS
+#define LAVF_API_MAX_STREAMS  (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
+
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got
  * a fucking problem with that, douchebag?
@@ -630,7 +634,7 @@ typedef struct AVChapter {
     AVMetadata *metadata;
 } AVChapter;
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_MAX_STREAMS
 #define MAX_STREAMS 20
 #endif
 
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 997b7686be..89491498cf 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -686,7 +686,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
                         code == 0x1be) /* padding_stream */
                         goto skip;
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_MAX_STREAMS
                     if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
                         goto skip;
 #endif
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 5b4a923135..bdc216270c 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -29,7 +29,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_MAX_STREAMS
 #define NUT_MAX_STREAMS MAX_STREAMS
 #else
 #define NUT_MAX_STREAMS 256    /* arbitrary sanity check value */
-- 
cgit v1.2.3