[FFmpeg-cvslog] Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
Michael Niedermayer
git at videolan.org
Wed Feb 19 22:09:52 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 19 22:09:10 2014 +0100| [4ba03e37fd169ca444bc7c5ca330363584afff1e] | committer: Michael Niedermayer
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ba03e37fd169ca444bc7c5ca330363584afff1e
---
More information about the ffmpeg-cvslog
mailing list