diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2016-03-28 20:29:54 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2016-03-31 18:03:21 +0200 |
| commit | 5f0226668124aa7ae4db501ba7f4ace4c770f3d1 (patch) | |
| tree | cf9cd103fcf8034650dccd8fdff372058f00523e /libavformat/matroska.h | |
| parent | 44f05f15d4a34ef2f0d62259e5d5b43371bc0954 (diff) | |
| download | ffmpeg-5f0226668124aa7ae4db501ba7f4ace4c770f3d1.tar.gz | |
matroska: Support interlaced content correctly
The matroska specification now has two elements for it.
Diffstat (limited to 'libavformat/matroska.h')
| -rw-r--r-- | libavformat/matroska.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index a7a22a96af..40402bcdb8 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -113,6 +113,7 @@ #define MATROSKA_ID_VIDEOPIXELCROPR 0x54DD #define MATROSKA_ID_VIDEODISPLAYUNIT 0x54B2 #define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A +#define MATROSKA_ID_VIDEOFIELDORDER 0x9D #define MATROSKA_ID_VIDEOSTEREOMODE 0x53B8 #define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3 #define MATROSKA_ID_VIDEOCOLORSPACE 0x2EB524 @@ -222,6 +223,21 @@ typedef enum { } MatroskaTrackEncodingCompAlgo; typedef enum { + MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED = 0, + MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED = 1, + MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE = 2 +} MatroskaVideoInterlaceFlag; + +typedef enum { + MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE = 0, + MATROSKA_VIDEO_FIELDORDER_UNDETERMINED = 2, + MATROSKA_VIDEO_FIELDORDER_TT = 1, + MATROSKA_VIDEO_FIELDORDER_BB = 6, + MATROSKA_VIDEO_FIELDORDER_BT = 9, + MATROSKA_VIDEO_FIELDORDER_TB = 14, +} MatroskaVideoFieldOrder; + +typedef enum { MATROSKA_VIDEO_STEREOMODE_TYPE_MONO = 0, MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT = 1, MATROSKA_VIDEO_STEREOMODE_TYPE_BOTTOM_TOP = 2, |