diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:40:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:48:23 +0200 |
| commit | fcc39099087e156196e3444ef479b2c778566405 (patch) | |
| tree | c01fed41ae719924e46f97ada39f186429f63c09 /libavformat/matroska.h | |
| parent | 31f9c228c042e7f0a017670e7eb18d9b27a71a10 (diff) | |
| parent | d4ae8ac92f619507aadd021bb67b517d39d3a36f (diff) | |
| download | ffmpeg-fcc39099087e156196e3444ef479b2c778566405.tar.gz | |
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
| -rw-r--r-- | libavformat/matroska.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 99f1c804ac..3b45eeb7a3 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; /* @@ -296,4 +297,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 */ |