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

[aurel]

Author: aurel
Date: Tue Aug  5 02:39:53 2008
New Revision: 14550

Log:
matroskadec: simplify flag default

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:53 2008
@@ -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.
  */
 

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Tue Aug  5 02:39:53 2008
@@ -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 (MatroskaDemuxContex
                 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   
             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)