diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:39:50 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:39:50 +0000 |
| commit | ead30062570f56a8a24009cdec7a783dc07ef6f7 (patch) | |
| tree | e47296a82541c1775c1ad85a5046e14adab37492 /libavformat | |
| parent | 5f8e022701ba2f0f4ef27b25845bec69928c4061 (diff) | |
| download | ffmpeg-ead30062570f56a8a24009cdec7a783dc07ef6f7.tar.gz | |
matroskadec: remove storage of various unused flags
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.h | 7 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 14 |
2 files changed, 0 insertions, 21 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 35c618ba53..62298d8fd6 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -195,16 +195,9 @@ typedef enum { */ typedef enum { - MATROSKA_TRACK_ENABLED = (1<<0), MATROSKA_TRACK_DEFAULT = (1<<1), - MATROSKA_TRACK_LACING = (1<<2), - MATROSKA_TRACK_SHIFT = (1<<16) } MatroskaTrackFlags; -typedef enum { - MATROSKA_VIDEOTRACK_INTERLACED = (MATROSKA_TRACK_SHIFT<<0) -} MatroskaVideoTrackFlags; - /* * Matroska Codec IDs. Strings. */ diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 34501df59b..4630482f4c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1218,12 +1218,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska) if ((res = ebml_read_uint(matroska, &id, &num)) < 0) break; - if (num) - track->flags |= - MATROSKA_VIDEOTRACK_INTERLACED; - else - track->flags &= - ~MATROSKA_VIDEOTRACK_INTERLACED; break; } @@ -1391,10 +1385,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska) uint64_t num; if ((res = ebml_read_uint(matroska, &id, &num)) < 0) break; - if (num) - track->flags |= MATROSKA_TRACK_ENABLED; - else - track->flags &= ~MATROSKA_TRACK_ENABLED; break; } @@ -1416,10 +1406,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska) uint64_t num; if ((res = ebml_read_uint(matroska, &id, &num)) < 0) break; - if (num) - track->flags |= MATROSKA_TRACK_LACING; - else - track->flags &= ~MATROSKA_TRACK_LACING; break; } |