Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 22:14:20 +0000 (23:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 22:14:26 +0000 (23:14 +0100)
* commit '7840c40445c9f52aeccba96de3d27613398bfbf2':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

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

Simple merge