Ronald S. Bultje <[email protected]> added the comment: Here is a forward from ffmpeg-devel. Please adjust the patch so it has the correct message and MAX_STREAMS (100, not 99, since they're numbered from 0 onwards, not 1 onwards), and then it's OK.
2011/1/24 Måns Rullgård <[email protected]>: > "Ronald S. Bultje" <[email protected]> writes: > >> Hi guys, >> >> posting next patch: >> >> longstone <[email protected]> added the comment: >>> Add error check in avi_write_header() function. >> >> Looks fine to me, although I guess 99 should be 100 (100 streams means >> IDs 00-99). > > Correct. > >> Ronald >> >> Index: libavformat/avi.h >> =================================================================== >> --- libavformat/avi.h (revision 26402) >> +++ libavformat/avi.h (working copy) >> @@ -32,6 +32,7 @@ >> >> #define AVI_MAX_RIFF_SIZE 0x40000000LL >> #define AVI_MASTER_INDEX_SIZE 256 >> +#define AVI_MAX_STREAM_COUNT 99 //AVI format is able to assign stream ID for at most 99 streams > > Wrong value and useless comment. > >> /* index flags */ >> #define AVIIF_INDEX 0x10 >> Index: libavformat/avienc.c >> =================================================================== >> --- libavformat/avienc.c (revision 26402) >> +++ libavformat/avienc.c (working copy) >> @@ -85,8 +85,8 @@ >> >> static char* avi_stream2fourcc(char* tag, int index, enum AVMediaType type) >> { >> - tag[0] = '0'; >> - tag[1] = '0' + index; >> + tag[0] = '0' + (index/10); >> + tag[1] = '0' + (index%10); > > Lose the (). > >> if (type == AVMEDIA_TYPE_VIDEO) { >> tag[2] = 'd'; >> tag[3] = 'c'; >> @@ -158,6 +158,12 @@ >> int64_t list1, list2, strh, strf; >> AVMetadataTag *t = NULL; >> >> + /* check the total stream number */ > > Useless comment. > >> + if (s->nb_streams > AVI_MAX_STREAM_COUNT) { >> + av_log(s, AV_LOG_ERROR, "Too many streams for avi format file. Please limit the number to be less than 100.\n"); >> + return -1; >> + } > > Wrong message. > > -- > Måns Rullgård > [email protected] > _______________________________________________ > ffmpeg-devel mailing list > [email protected] > https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-devel > ________________________________________________ FFmpeg issue tracker <[email protected]> <https://roundup.ffmpeg.org/issue2563> ________________________________________________
