[FFmpeg-cvslog] Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
Michael Niedermayer
git at videolan.org
Sun Nov 17 00:20:34 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 00:11:33 2013 +0100| [cc4a6435638fa2a471fef048a3e68eaf7e6e306c] | committer: Michael Niedermayer
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
asvenc: use the AVFrame API properly.
a64multienc: use the AVFrame API properly.
Conflicts:
libavcodec/vaapi_mpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc4a6435638fa2a471fef048a3e68eaf7e6e306c
---
More information about the ffmpeg-cvslog
mailing list