[FFmpeg-cvslog] Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'

Michael Niedermayer git at videolan.org
Mon Jul 27 21:14:17 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 27 21:03:20 2015 +0200| [0b6f092ed31b83e01e980b596ef8bdd9db6cfff6] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b6f092ed31b83e01e980b596ef8bdd9db6cfff6
---





More information about the ffmpeg-cvslog mailing list