diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:31:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:31:34 +0100 |
| commit | 2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7 (patch) | |
| tree | 5e6c198f1ad91f66c929728af2178300c1356908 /libavcodec/metasound.c | |
| parent | 1ac4797d1998a894eccc5fe68396c7df1abd2093 (diff) | |
| parent | ddb839e9286594ff7a862a956402106fca7055c9 (diff) | |
| download | ffmpeg-2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7.tar.gz | |
Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'
* commit 'ddb839e9286594ff7a862a956402106fca7055c9':
metasound: add missing modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/metasound.c')
| -rw-r--r-- | libavcodec/metasound.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 597c33351f..d06bb76d83 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -301,12 +301,36 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx) case (1 << 16) + ( 8 << 8) + 8: tctx->mtab = &ff_metasound_mode0808; break; + case (2 << 16) + ( 8 << 8) + 8: + tctx->mtab = &ff_metasound_mode0808s; + break; + case (1 << 16) + (11 << 8) + 10: + tctx->mtab = &ff_metasound_mode1110; + break; + case (2 << 16) + (11 << 8) + 10: + tctx->mtab = &ff_metasound_mode1110s; + break; case (1 << 16) + (16 << 8) + 16: tctx->mtab = &ff_metasound_mode1616; break; + case (2 << 16) + (16 << 8) + 16: + tctx->mtab = &ff_metasound_mode1616s; + break; case (1 << 16) + (44 << 8) + 32: tctx->mtab = &ff_metasound_mode4432; break; + case (2 << 16) + (44 << 8) + 32: + tctx->mtab = &ff_metasound_mode4432s; + break; + case (1 << 16) + (44 << 8) + 40: + tctx->mtab = &ff_metasound_mode4440; + break; + case (2 << 16) + (44 << 8) + 40: + tctx->mtab = &ff_metasound_mode4440s; + break; + case (1 << 16) + (44 << 8) + 48: + tctx->mtab = &ff_metasound_mode4448; + break; case (2 << 16) + (44 << 8) + 48: tctx->mtab = &ff_metasound_mode4448s; break; |