Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

matroskadec: remove storage of various unused flags

Browse source 
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:39:50 +00:00
parent 5f8e022701
commit ead3006257
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavformat/matroska.h
View file

@ -195,16 +195,9 @@ typedef enum {
*/ */
typedef enum { typedef enum {
MATROSKA_TRACK_ENABLED = (1<<0),
MATROSKA_TRACK_DEFAULT = (1<<1), MATROSKA_TRACK_DEFAULT = (1<<1),
MATROSKA_TRACK_LACING = (1<<2),
MATROSKA_TRACK_SHIFT = (1<<16)
} MatroskaTrackFlags; } MatroskaTrackFlags;
typedef enum {
MATROSKA_VIDEOTRACK_INTERLACED = (MATROSKA_TRACK_SHIFT<<0)
} MatroskaVideoTrackFlags;
/* /*
* Matroska Codec IDs. Strings. * Matroska Codec IDs. Strings.
*/ */

14
libavformat/matroskadec.c
View file

@ -1218,12 +1218,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_uint(matroska, &id, if ((res = ebml_read_uint(matroska, &id,
&num)) < 0) &num)) < 0)
break; break;
if (num)
track->flags |=
MATROSKA_VIDEOTRACK_INTERLACED;
else
track->flags &=
~MATROSKA_VIDEOTRACK_INTERLACED;
break; break;
} }
@ -1391,10 +1385,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
uint64_t num; uint64_t num;
if ((res = ebml_read_uint(matroska, &id, &num)) < 0) if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break; break;
if (num)
track->flags |= MATROSKA_TRACK_ENABLED;
else
track->flags &= ~MATROSKA_TRACK_ENABLED;
break; break;
} }
@ -1416,10 +1406,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
uint64_t num; uint64_t num;
if ((res = ebml_read_uint(matroska, &id, &num)) < 0) if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break; break;
if (num)
track->flags |= MATROSKA_TRACK_LACING;
else
track->flags &= ~MATROSKA_TRACK_LACING;
break; break;
} }