diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:45:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:45:24 +0200 |
| commit | 227ac71a60937785a5e5e21618a929ee3b887015 (patch) | |
| tree | 9541a3fb7e9c8dac6b1acb70ea5cb87eb56f04e3 | |
| parent | d4e85004ec6f6a1fd5c67862971601a4402f442b (diff) | |
| parent | 696a74e81560889ef2fde76b045c5158a325a7a5 (diff) | |
| download | ffmpeg-227ac71a60937785a5e5e21618a929ee3b887015.tar.gz | |
Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroska.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 1e92073921..82a135c92c 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -35,7 +35,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_MPEG/L2" , AV_CODEC_ID_MP2}, {"A_MPEG/L1" , AV_CODEC_ID_MP2}, {"A_MPEG/L3" , AV_CODEC_ID_MP3}, - {"A_OPUS", AV_CODEC_ID_OPUS}, + {"A_OPUS" , AV_CODEC_ID_OPUS}, {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE}, {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE}, {"A_PCM/INT/BIG" , AV_CODEC_ID_PCM_S16BE}, |