virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

matroskadec: simplify flag default

Browse Source 
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:39:53 +00:00
parent ead3006257
commit 4eff97439b
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/matroska.h
View File

@ -189,15 +189,6 @@ typedef enum {
MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3, MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3,
} MatroskaTrackEncodingCompAlgo; } 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. * Matroska Codec IDs. Strings.
*/ */

9
libavformat/matroskadec.c
View File

@ -63,7 +63,7 @@ typedef struct Track {
double time_scale; double time_scale;
uint64_t default_duration; uint64_t default_duration;
MatroskaTrackFlags flags; uint64_t flag_default;
int encoding_scope; int encoding_scope;
MatroskaTrackEncodingCompAlgo encoding_algo; MatroskaTrackEncodingCompAlgo encoding_algo;
@ -1393,10 +1393,7 @@ 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->flag_default = num;
track->flags |= MATROSKA_TRACK_DEFAULT;
else
track->flags &= ~MATROSKA_TRACK_DEFAULT;
break; break;
} }
@ -2640,7 +2637,7 @@ matroska_read_header (AVFormatContext *s,
if (strcmp(track->language, "und")) if (strcmp(track->language, "und"))
av_strlcpy(st->language, track->language, 4); av_strlcpy(st->language, track->language, 4);
if (track->flags & MATROSKA_TRACK_DEFAULT) if (track->flag_default)
st->disposition |= AV_DISPOSITION_DEFAULT; st->disposition |= AV_DISPOSITION_DEFAULT;
if (track->default_duration) if (track->default_duration)