virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API

Browse Source 
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-08-17 19:30:21 +00:00
parent 6a36facc3d
commit 072e3efd1b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -35,6 +35,10 @@
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) #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 * I return the LIBAVFORMAT_VERSION_INT constant. You got
* a fucking problem with that, douchebag? * a fucking problem with that, douchebag?
@ -630,7 +634,7 @@ typedef struct AVChapter {
AVMetadata *metadata; AVMetadata *metadata;
} AVChapter; } AVChapter;
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if LAVF_API_MAX_STREAMS
#define MAX_STREAMS 20 #define MAX_STREAMS 20
#endif #endif

2
libavformat/mpegts.c
View File

@ -686,7 +686,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
code == 0x1be) /* padding_stream */ code == 0x1be) /* padding_stream */
goto skip; goto skip;
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if LAVF_API_MAX_STREAMS
if (!pes->st && pes->stream->nb_streams == MAX_STREAMS) if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
goto skip; goto skip;
#endif #endif

2
libavformat/nutdec.c
View File

@ -29,7 +29,7 @@
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if LAVF_API_MAX_STREAMS
#define NUT_MAX_STREAMS MAX_STREAMS #define NUT_MAX_STREAMS MAX_STREAMS
#else #else
#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */ #define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */