Browse code
Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2
* commit '79041d92ee7421853ee8c57fc13891cb0c272e0e':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2014/05/05 04:25:27Showing 1 changed files
| ... | ... |
@@ -35,7 +35,7 @@ const CodecTags ff_mkv_codec_tags[]={
|
| 35 | 35 |
{"A_MPEG/L2" , AV_CODEC_ID_MP2},
|
| 36 | 36 |
{"A_MPEG/L1" , AV_CODEC_ID_MP2},
|
| 37 | 37 |
{"A_MPEG/L3" , AV_CODEC_ID_MP3},
|
| 38 |
- {"A_OPUS", AV_CODEC_ID_OPUS},
|
|
| 38 |
+ {"A_OPUS" , AV_CODEC_ID_OPUS},
|
|
| 39 | 39 |
{"A_OPUS/EXPERIMENTAL",AV_CODEC_ID_OPUS},
|
| 40 | 40 |
{"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE},
|
| 41 | 41 |
{"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE},
|