Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 20:18:13 +0000 (21:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 20:18:18 +0000 (21:18 +0100)
commitc3d12156839475510e38df0bc3777a8781a3e7a8
tree590ec8444ea401636e9ce3edf470f319da586a52
parent9d13432a90979de8e21bff4641c1da3dbac02584
parent1f604f96ea70503caa642f68a85be6074a5b3f46
Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'

* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
  ac3: set default matrix encoding modes in parse_frame_header.

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