Michael Niedermayer ec8f56efad Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637' ...

* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
  lavc: make rc_eq into private options of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h

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

2014-10-18 14:06:15 +02:00

9.6 KiB

Raw Blame History

View Raw