Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 17:23:00 +0000 (19:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 17:23:00 +0000 (19:23 +0200)
commit25f4e9387d0efd6fe2ac51d78eb681c542a6f82d
tree436efd419bb560e735df6afd621be3fd8a95636d
parentae6ba2db8ff811fa1fe23c5abffcc8086dcbc052
parent530c1441fd1426b6a4bb33485ff3226e1ae0ad45
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>
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/ratecontrol.c