Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:10:38 +0000 (12:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:10:38 +0000 (12:10 +0200)
commitac20ba35e37dac843c9692a02a63e6a6e3bcce36
tree94637e759d3202b0092f968fc0df8d333cf2e732
parent198e10b55cc908d9194d34013d212e4b5ff3b42f
parent031be5b41b54c3b666f31d83fe3ad41c194af8c5
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'

* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
  ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof

Conflicts:
libavcodec/ac3dec.c

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