diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-03-07 19:25:09 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-03-07 19:25:09 +0000 |
| commit | 90c2295b24e9fa0c857e459088d18945a6681ef0 (patch) | |
| tree | 682f689f79fb24ab9cf3277aadaf71c8af625231 /libavformat/matroskadec.c | |
| parent | b049ad505478a099535a796306f619a4365ee707 (diff) | |
| download | ffmpeg-streaming-90c2295b24e9fa0c857e459088d18945a6681ef0.zip ffmpeg-streaming-90c2295b24e9fa0c857e459088d18945a6681ef0.tar.gz | |
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
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d9fdcec..61aacb7 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2298,6 +2298,9 @@ matroska_read_header (AVFormatContext *s, if (strcmp(track->language, "und")) strcpy(st->language, track->language); + if (track->flags & MATROSKA_TRACK_DEFAULT) + st->disposition |= AV_DISPOSITION_DEFAULT; + if (track->default_duration) av_reduce(&st->codec->time_base.num, &st->codec->time_base.den, track->default_duration, 1000000000, 30000); |
