X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmatroska.h;h=391c56c0aa146ae979d5a4471b5888d9203a8a85;hb=c29d999f71f65560a61b638a983745d26cde1fc4;hp=99f1c804aca2f25b40aea04f823cb7f6fbe7e647;hpb=b3b05a11d31d544025c0400a1c6bc70124300a86;p=ffmpeg diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 99f1c804aca..391c56c0aa1 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -261,6 +261,7 @@ typedef enum { MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG = 12, MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_LR = 13, MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_RL = 14, + MATROSKA_VIDEO_STEREOMODE_TYPE_NB, } MatroskaVideoStereoModeType; /* @@ -275,13 +276,12 @@ typedef struct CodecTags{ /* max. depth in the EBML tree structure */ #define EBML_MAX_DEPTH 16 -#define MATROSKA_VIDEO_STEREO_MODE_COUNT 15 #define MATROSKA_VIDEO_STEREO_PLANE_COUNT 3 extern const CodecTags ff_mkv_codec_tags[]; extern const CodecMime ff_mkv_mime_tags[]; extern const AVMetadataConv ff_mkv_metadata_conv[]; -extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT]; +extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB]; extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT]; /* AVStream Metadata tag keys for WebM Dash Manifest */ @@ -296,4 +296,6 @@ extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_P #define TRACK_NUMBER "webm_dash_manifest_track_number" #define CODEC_PRIVATE_SIZE "webm_dash_manifest_codec_priv_size" +int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode); + #endif /* AVFORMAT_MATROSKA_H */