Mercurial > libavformat.hg

changeset 3630:23666678a608 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
matroskadec: simplify flag default
author aurel
date Tue, 05 Aug 2008 00:39:53 +0000
parents 8f06218b8767
children 951c7aaaf2a2
files matroska.h matroskadec.c
diffstat 2 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.h	Tue Aug 05 00:39:50 2008 +0000
+++ b/matroska.h	Tue Aug 05 00:39:53 2008 +0000
@@ -190,15 +190,6 @@
 } 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.
  */
 
--- a/matroskadec.c	Tue Aug 05 00:39:50 2008 +0000
+++ b/matroskadec.c	Tue Aug 05 00:39:53 2008 +0000
@@ -63,7 +63,7 @@
 
     double time_scale;
     uint64_t default_duration;
-    MatroskaTrackFlags flags;
+    uint64_t flag_default;
 
     int encoding_scope;
     MatroskaTrackEncodingCompAlgo encoding_algo;
@@ -1393,10 +1393,7 @@
                 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 @@
             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)