[FFmpeg-cvslog] Merge commit '38d044429dabcd28928693240e955c6d4430cca9'
Michael Niedermayer
git at videolan.org
Thu Jun 26 21:36:32 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 21:28:54 2014 +0200| [c9083d85df460dd4661cdcd7d70fa7cb7b45a352] | committer: Michael Niedermayer
Merge commit '38d044429dabcd28928693240e955c6d4430cca9'
* commit '38d044429dabcd28928693240e955c6d4430cca9':
output example: use the new AVFrame API for allocating the video frame
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9083d85df460dd4661cdcd7d70fa7cb7b45a352
---
More information about the ffmpeg-cvslog
mailing list