matroskadec: remove storage of various unused flags

Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 35c618b..62298d8 100644 (file)
--- 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 34501df..4630482 100644 (file)
--- 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;
             }