ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25f4e9387d0efd6fe2ac51d78eb681c542a6f82d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
