[FFmpeg-cvslog] Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
Michael Niedermayer
git at videolan.org
Sat Oct 18 20:12:48 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 19:23:00 2014 +0200| [25f4e9387d0efd6fe2ac51d78eb681c542a6f82d] | committer: Michael Niedermayer
Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
lavc: make lmax/lmin into private options of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25f4e9387d0efd6fe2ac51d78eb681c542a6f82d
---
More information about the ffmpeg-cvslog
mailing list