OSDN Git Service

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)
commitd18234f31915f5aba523ade54ff75aab062c647f
tree9ae1b43fd8b43c7202f0ed279aa49fdf7dfc2049
parent7b3c78b5e6ded82ea9f264806bf4e3068f37f4cf
parent7840c40445c9f52aeccba96de3d27613398bfbf2
Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'

* commit '7840c40445c9f52aeccba96de3d27613398bfbf2':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

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