Michael Niedermayer 25f4e9387d Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45' ...

* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
  lavc: make lmax/lmin into private options of mpegvideo encoders

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-18 19:23:00 +02:00

35 KiB

Raw Blame History

View Raw