1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Files
FFmpeg/libavcodec
Michael Niedermayer 0b6f092ed3 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>
2015-07-27 21:03:20 +02:00
..
2015-07-27 19:13:48 +02:00
2015-07-27 19:13:48 +02:00
2015-07-27 19:13:48 +02:00
2015-07-25 14:07:55 +02:00
2015-07-27 19:13:48 +02:00
2015-07-26 17:18:35 +02:00
2015-07-22 23:23:29 +02:00
2015-07-22 16:15:53 +02:00
2015-07-27 19:13:48 +02:00
2015-07-22 23:23:29 +02:00