[FFmpeg-cvslog] Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
Michael Niedermayer
git at videolan.org
Sun Aug 10 00:49:12 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 00:26:45 2014 +0200| [a57ece0cb48ba131a2d6ba9d4525d9195238f18c] | committer: Michael Niedermayer
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a57ece0cb48ba131a2d6ba9d4525d9195238f18c
---
More information about the ffmpeg-cvslog
mailing list