Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'

* commit 'ddb839e9286594ff7a862a956402106fca7055c9':
  metasound: add missing modes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/48/head
Michael Niedermayer 11 years ago
commit 2cfdc2879a
  1. 24
      libavcodec/metasound.c
  2. 10224
      libavcodec/metasound_data.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;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save