Commit a443b973 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: make stream default if its the only of its kind and no source can be...

ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it

Fixes Ticket2969
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4fb14f84
......@@ -2160,6 +2160,15 @@ static int transcode_init(void)
ost->st->disposition = ist->st->disposition;
codec->bits_per_raw_sample = icodec->bits_per_raw_sample;
codec->chroma_sample_location = icodec->chroma_sample_location;
} else {
for (j=0; j<oc->nb_streams; j++) {
AVStream *st = oc->streams[j];
if (st != ost->st && st->codec->codec_type == codec->codec_type)
break;
}
if (j == oc->nb_streams)
if (codec->codec_type == AVMEDIA_TYPE_AUDIO || codec->codec_type == AVMEDIA_TYPE_VIDEO)
ost->st->disposition = AV_DISPOSITION_DEFAULT;
}
if (ost->stream_copy) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment