Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 12:45:04 +0000 (13:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 12:45:09 +0000 (13:45 +0100)
* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
  ac3dec: Remove write-only channel_layout field from AC3DecodeContext

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

Simple merge
Simple merge