diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:39:53 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:39:53 +0000 |
| commit | 4eff97439b1cafea2b313d948566255cbd97d9fb (patch) | |
| tree | b49e614508a97f783a1ed4a8e5aa66fd38c9af9e | |
| parent | ead30062570f56a8a24009cdec7a783dc07ef6f7 (diff) | |
| download | ffmpeg-4eff97439b1cafea2b313d948566255cbd97d9fb.tar.gz | |
matroskadec: simplify flag default
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroska.h | 9 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 9 |
2 files changed, 3 insertions, 15 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 62298d8fd6..613e27a4e7 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -190,15 +190,6 @@ typedef enum { } MatroskaTrackEncodingCompAlgo; /* - * These aren't in any way "matroska-form" things, - * it's just something I use in the muxer/demuxer. - */ - -typedef enum { - MATROSKA_TRACK_DEFAULT = (1<<1), -} MatroskaTrackFlags; - -/* * Matroska Codec IDs. Strings. */ diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4630482f4c..b4814ca2a2 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -63,7 +63,7 @@ typedef struct Track { double time_scale; uint64_t default_duration; - MatroskaTrackFlags flags; + uint64_t flag_default; int encoding_scope; MatroskaTrackEncodingCompAlgo encoding_algo; @@ -1393,10 +1393,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska) uint64_t num; if ((res = ebml_read_uint(matroska, &id, &num)) < 0) break; - if (num) - track->flags |= MATROSKA_TRACK_DEFAULT; - else - track->flags &= ~MATROSKA_TRACK_DEFAULT; + track->flag_default = num; break; } @@ -2640,7 +2637,7 @@ matroska_read_header (AVFormatContext *s, if (strcmp(track->language, "und")) av_strlcpy(st->language, track->language, 4); - if (track->flags & MATROSKA_TRACK_DEFAULT) + if (track->flag_default) st->disposition |= AV_DISPOSITION_DEFAULT; if (track->default_duration) |