Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 19:03:20 +0000 (21:03 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 19:03:20 +0000 (21:03 +0200)
commit0b6f092ed31b83e01e980b596ef8bdd9db6cfff6
tree844a58a9d243b289647cb6693b9102bff7b4f6ec
parent59b009411fcc8531d661a381bbd2608e36c20bd0
parent4b6b1082a73907c7c3de2646c6398bc61320f2c6
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'

* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
  lavc: Deprecate avctx.me_method

Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
13 files changed:
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/motion_est.c
libavcodec/motion_est.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/svq1enc.c
libavcodec/svq1enc.h
libavcodec/version.h
libavcodec/wmv2enc.c