Merge commit 'a5ebe5d1217942238c641c83b24ef1106e53934a'
authorClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 20:43:59 +0000 (21:43 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 20:43:59 +0000 (21:43 +0100)
commit7c4dbd1df985b171252d0d8deaf3c87c82d710da
tree44d53661bebc4cd85d819b1dbc8c3666a91107fe
parent8636ccb5c0ffd0d1b22c2774a4921cea7e0163b1
parenta5ebe5d1217942238c641c83b24ef1106e53934a
Merge commit 'a5ebe5d1217942238c641c83b24ef1106e53934a'

* commit 'a5ebe5d1217942238c641c83b24ef1106e53934a':
  ac3dec: Split spx-specific code from decode_audio_block()

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/ac3dec.c