1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 8c5fece11f Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
  aacdec: set AVFrame sample_rate

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12 15:00:03 +01:00
..
2014-02-12 13:12:22 +00:00
2014-02-12 13:12:22 +00:00
2014-02-12 13:12:22 +00:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-02-12 13:12:22 +00:00