[FFmpeg-cvslog] Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
Michael Niedermayer
git at videolan.org
Mon Dec 16 22:04:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 16 21:36:14 2013 +0100| [792845e436ddc5f3ce11ba02535a3372919061f2] | committer: Michael Niedermayer
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
Bump libavutil major version to account for the LLS API/ABI changes.
Conflicts:
libavutil/version.h
Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=792845e436ddc5f3ce11ba02535a3372919061f2
---
More information about the ffmpeg-cvslog
mailing list