[FFmpeg-cvslog] Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
Michael Niedermayer
git at videolan.org
Wed Feb 12 15:17:59 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 12 14:59:00 2014 +0100| [8c5fece11fcb845f459eebb86b03f98d39e5880c] | committer: Michael Niedermayer
Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
aacdec: set AVFrame sample_rate
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c5fece11fcb845f459eebb86b03f98d39e5880c
---
More information about the ffmpeg-cvslog
mailing list