DV muxer should not only fail for more that 3 streams altogether
but also if two of them are video or all three are audio. Originally committed as revision 9403 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e46e884f25
commit
01fa74adb9
@ -300,9 +300,11 @@ DVMuxContext* dv_init_mux(AVFormatContext* s)
|
|||||||
for (i=0; i<s->nb_streams; i++) {
|
for (i=0; i<s->nb_streams; i++) {
|
||||||
switch (s->streams[i]->codec->codec_type) {
|
switch (s->streams[i]->codec->codec_type) {
|
||||||
case CODEC_TYPE_VIDEO:
|
case CODEC_TYPE_VIDEO:
|
||||||
|
if (vst) return NULL;
|
||||||
vst = s->streams[i];
|
vst = s->streams[i];
|
||||||
break;
|
break;
|
||||||
case CODEC_TYPE_AUDIO:
|
case CODEC_TYPE_AUDIO:
|
||||||
|
if (c->n_ast > 1) return NULL;
|
||||||
c->ast[c->n_ast++] = s->streams[i];
|
c->ast[c->n_ast++] = s->streams[i];
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user