[FFmpeg-cvslog] r14549 - in trunk/libavformat: matroska.h matroskadec.c

[aurel]

Author: aurel
Date: Tue Aug  5 02:39:50 2008
New Revision: 14549

Log:
matroskadec: remove storage of various unused flags

Modified:
   trunk/libavformat/matroska.h
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroska.h
==============================================================================
--- trunk/libavformat/matroska.h	(original)
+++ trunk/libavformat/matroska.h	Tue Aug  5 02:39:50 2008
@@ -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.
  */

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Tue Aug  5 02:39:50 2008
@@ -1218,12 +1218,6 @@ matroska_add_stream (MatroskaDemuxContex
                             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 (MatroskaDemuxContex
                 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 (MatroskaDemuxContex
                 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;
             }