[FFmpeg-cvslog] Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
Michael Niedermayer
git at videolan.org
Thu Jun 26 22:50:22 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 22:44:35 2014 +0200| [11991a7d9069dc80a0548d1521d227a3233deb1a] | committer: Michael Niedermayer
Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
output example: use the new AVFrame API to allocate audio frames
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11991a7d9069dc80a0548d1521d227a3233deb1a
---
More information about the ffmpeg-cvslog
mailing list