Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 13:59:00 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 14:00:03 +0000 (15:00 +0100)
commit8c5fece11fcb845f459eebb86b03f98d39e5880c
treea07ddbe4933e3934756d6459df3f4b82218a65a4
parent1bc3f1b73dfff1a23b9bad1d4fef32dcced47f64
parent462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6
Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'

* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
  aacdec: set AVFrame sample_rate

Conflicts:
libavcodec/aacdec.c

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