diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-28 14:58:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-28 14:58:30 +0300 |
| commit | b880c13c3aa9e0d00509586224a0b30586ebb594 (patch) | |
| tree | 3f63af5ab8fb50adc042df2971556cf96951eb5c /source/blender/makesdna | |
| parent | a33034cc3fd17802ffdd3e87e9958f5539f67bbb (diff) | |
| parent | b030277e791e429e8f8de90316144830eda6bbf8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 5fe57dd6d1e..73d6249a263 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -136,6 +136,14 @@ typedef enum eFFMpegCrf { FFM_CRF_LOWEST = 32, } eFFMpegCrf; +typedef enum eFFMpegAudioChannels { + FFM_CHANNELS_MONO = 1, + FFM_CHANNELS_STEREO = 2, + FFM_CHANNELS_SURROUND4 = 4, + FFM_CHANNELS_SURROUND51 = 6, + FFM_CHANNELS_SURROUND71 = 8, +} eFFMpegAudioChannels; + typedef struct FFMpegCodecData { int type; int codec; |