Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:21:07 +0000 (13:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:21:17 +0000 (13:21 +0100)
commit683ab5fec9942ca2ba2b060dcd0794a362cb2545
treed5cecf1c7043a356a56d7ffaa942ed602b7d718a
parent054e4bab83b789a4f958d6d8f56418e34c279e4b
parentf2521563d1a0c3e2a21892f59f3327b82b3db7fc
Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'

* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
  g722dec: Change bits_per_codeword to the right option type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/g722dec.c