lavc: make rc_eq into private options of mpegvideo encoders
lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders
lavc: deprecate unused me_threshold field
libvpxenc: add static-thresh private option

Currently, this option is accessed through AVCodecContext.mb_threshold,
which originally controlled reusing MB data when transcoding mpeg to
mpeg. Since the libvpx meaning is completely different from the original
mpegvideo meaning, it is better to use a separate private option for
this.
lavc: deprecate unused mb_threshold field
lavc: make border_masking into private options of mpegvideo encoders
lavc: make lmax/lmin into private options of mpegvideo encoders
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>
Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'

* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

* commit '685be3d1aecf965281128f3b631ed965bcfa754d':
  libvpxenc: add static-thresh private option

Conflicts:
	libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'

* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
  lavc: make border_masking into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil: Add missing av_free() to cast5 selftest

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vf_drawtext: Do not leak the mmapped textfile

And validate its size while at it.

CC: libav-stable@libav.org
Bug-Id: CID 1244189
vf_showinfo: Forward the av_image_get_linesize error

CC: libav-stable@libav.org
Bug-Id: CID 1087086
af_resample: check av_opt_set_dict return value

CC: libav-stable@libav.org
Bug-Id: CID 1087076
avresample: prevent theoretical division by zero

CC: libav-stable@libav.org
Bug-Id: CID 1231986
avresample: Make sure the even check does not overflow

CC: libav-stable@libav.org
Bug-Id: CID 732225
avcodec/mjpegenc: add priv_class to encoders

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