mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
8c5fece11f
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6': aacdec: set AVFrame sample_rate Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>