From 90c2295b24e9fa0c857e459088d18945a6681ef0 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Fri, 7 Mar 2008 19:25:09 +0000 Subject: Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing of matroska and nut. Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index dc1c66b45d..cd04727f94 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1592,6 +1592,8 @@ static int av_encode(AVFormatContext **output_files, av_strlcpy(ost->st->language, ist->st->language, sizeof(ost->st->language)); + ost->st->disposition = ist->st->disposition; + if (ost->st->stream_copy) { /* if stream_copy is selected, no need to decode or encode */ codec->codec_id = icodec->codec_id; -- cgit v1.2.3