[FFmpeg-cvslog] Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2
Michael Niedermayer
git at videolan.org
Tue Mar 11 12:14:20 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 12:09:13 2014 +0100| [ff1e9822056804797be7c7844c577565d5aad21d] | committer: Michael Niedermayer
Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2
* commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d':
doc: fix a couple of typos in frame.h
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff1e9822056804797be7c7844c577565d5aad21d
---
More information about the ffmpeg-cvslog
mailing list