[FFmpeg-cvslog] Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
Michael Niedermayer
git at videolan.org
Mon Feb 24 22:28:06 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 22:19:41 2014 +0100| [26dad980baaa6858561b3269d375c1d9223f579c] | committer: Michael Niedermayer
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26dad980baaa6858561b3269d375c1d9223f579c
---
More information about the ffmpeg-cvslog
mailing list