[SCM] libav/experimental: properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 61138c43e08b7bb039fbcf50f1e71d6e735e04a5
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Wed Oct 6 21:43:46 2010 +0000

    properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR
    
    Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4a46a36..b08f758 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -672,7 +672,7 @@ typedef struct AVFormatContext {
     void *priv_data;
     ByteIOContext *pb;
     unsigned int nb_streams;
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_MAX_STREAMS
     AVStream *streams[MAX_STREAMS];
 #else
     AVStream **streams;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 73f89a0..1b58b34 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2543,7 +2543,13 @@ AVStream *av_new_stream(AVFormatContext *s, int id)
 {
     AVStream *st;
     int i;
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+
+#if FF_API_MAX_STREAMS
+    if (s->nb_streams >= MAX_STREAMS){
+        av_log(s, AV_LOG_ERROR, "Too many streams\n");
+        return NULL;
+    }
+#else
     AVStream **streams;
 
     if (s->nb_streams >= INT_MAX/sizeof(*streams))
@@ -2552,11 +2558,6 @@ AVStream *av_new_stream(AVFormatContext *s, int id)
     if (!streams)
         return NULL;
     s->streams = streams;
-#else
-    if (s->nb_streams >= MAX_STREAMS){
-        av_log(s, AV_LOG_ERROR, "Too many streams\n");
-        return NULL;
-    }
 #endif
 
     st = av_mallocz(sizeof(AVStream));

-- 
Libav/FFmpeg packaging