[FFmpeg-cvslog] Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'
Michael Niedermayer
git at videolan.org
Thu Sep 4 20:15:10 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 4 20:00:01 2014 +0200| [ddc6adaa280aecd973cc3cc1661f8bafe28738c8] | committer: Michael Niedermayer
Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'
* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
vc1: Split bits used in libavformat into a separate header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddc6adaa280aecd973cc3cc1661f8bafe28738c8
---
More information about the ffmpeg-cvslog
mailing list