diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:58:18 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-08 22:58:18 +0100 |
| commit | f3972b3b7dfaea254187c1f26c22b9b8761a9bf0 (patch) | |
| tree | b8e38fb8ea75e191628eed54d642433a0819dfd5 /libavformat/matroska.h | |
| parent | f93c409c0b71d6353129fef3e85f89373d19d4d5 (diff) | |
| parent | 5f0226668124aa7ae4db501ba7f4ace4c770f3d1 (diff) | |
| download | ffmpeg-f3972b3b7dfaea254187c1f26c22b9b8761a9bf0.tar.gz | |
Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'
* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
matroska: Support interlaced content correctly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 e97fe6b5c7..e427c0ec99 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -119,6 +119,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_VIDEOALPHAMODE 0x53C0 #define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3 @@ -275,6 +276,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, |