virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR

Browse Source 
Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-10-06 21:43:46 +00:00
parent 38aab35f47
commit 61138c43e0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -672,7 +672,7 @@ typedef struct AVFormatContext {
void *priv_data; void *priv_data;
ByteIOContext *pb; ByteIOContext *pb;
unsigned int nb_streams; unsigned int nb_streams;
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_MAX_STREAMS
AVStream *streams[MAX_STREAMS]; AVStream *streams[MAX_STREAMS];
#else #else
AVStream **streams; AVStream **streams;

13
libavformat/utils.c
View File

@ -2543,7 +2543,13 @@ AVStream *av_new_stream(AVFormatContext *s, int id)
{ {
AVStream *st; AVStream *st;
int i; 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; AVStream **streams;
if (s->nb_streams >= INT_MAX/sizeof(*streams)) if (s->nb_streams >= INT_MAX/sizeof(*streams))
@ -2552,11 +2558,6 @@ AVStream *av_new_stream(AVFormatContext *s, int id)
if (!streams) if (!streams)
return NULL; return NULL;
s->streams = streams; s->streams = streams;
#else
if (s->nb_streams >= MAX_STREAMS){
av_log(s, AV_LOG_ERROR, "Too many streams\n");
return NULL;
}
#endif #endif
st = av_mallocz(sizeof(AVStream)); st = av_mallocz(sizeof(AVStream));