Mercurial > libavformat.hg

changeset 6383:65745776af68 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API
author aurel
date Tue, 17 Aug 2010 19:30:21 +0000
parents a4e249f79b66
children 2d51ca7714c3
files avformat.h mpegts.c nutdec.c
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/avformat.h	Tue Aug 17 14:25:14 2010 +0000
+++ b/avformat.h	Tue Aug 17 19:30:21 2010 +0000
@@ -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 @@
     AVMetadata *metadata;
 } AVChapter;
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_MAX_STREAMS
 #define MAX_STREAMS 20
 #endif
 
--- a/mpegts.c	Tue Aug 17 14:25:14 2010 +0000
+++ b/mpegts.c	Tue Aug 17 19:30:21 2010 +0000
@@ -686,7 +686,7 @@
                         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
--- a/nutdec.c	Tue Aug 17 14:25:14 2010 +0000
+++ b/nutdec.c	Tue Aug 17 19:30:21 2010 +0000
@@ -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 */