diff options
| author | wm4 <wm4@nowhere> | 2014-07-01 21:53:23 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-01 21:53:23 +0200 |
| commit | 0208ad4f3b4d2331b8242bb6fb12a9a4475ccae6 (patch) | |
| tree | bf912dfea75f6fd2517aa5587c6f9d04b0f92b7d /demux/ebml.h | |
| parent | 2224ac51906b94478f2217c00dff585b51d4fed6 (diff) | |
| download | mpv-0208ad4f3b4d2331b8242bb6fb12a9a4475ccae6.tar.bz2 mpv-0208ad4f3b4d2331b8242bb6fb12a9a4475ccae6.tar.xz | |
demux: minor cleanups
Diffstat (limited to 'demux/ebml.h')
| -rw-r--r-- | demux/ebml.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/demux/ebml.h b/demux/ebml.h index 5a0af48e8c..a544ad41cf 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -28,7 +28,6 @@ struct mp_log; - /* EBML version supported */ #define EBML_VERSION 1 @@ -69,7 +68,6 @@ struct ebml_parse_ctx { #define EBML_ID_INVALID 0xffffffff - /* matroska track types */ #define MATROSKA_TRACK_VIDEO 0x01 /* rectangle-shaped pictures aka video */ #define MATROSKA_TRACK_AUDIO 0x02 /* anything you can hear */ @@ -78,18 +76,8 @@ struct ebml_parse_ctx { #define MATROSKA_TRACK_SUBTITLE 0x11 /* text-subtitles */ #define MATROSKA_TRACK_CONTROL 0x20 /* control-codes for menu or other stuff*/ -#ifndef UINT64_MAX -#define UINT64_MAX 18446744073709551615ULL -#endif - -#ifndef INT64_MAX -#define INT64_MAX 9223372036854775807LL -#endif - #define EBML_UINT_INVALID UINT64_MAX #define EBML_INT_INVALID INT64_MAX -#define EBML_FLOAT_INVALID -1000000000.0 - bool ebml_is_mkv_level1_id(uint32_t id); uint32_t ebml_read_id (stream_t *s); |