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-03-10 23:33:57 +01: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-04-20 04:11:23 +02:00
2015-06-04 23:10:56 +02:00
2015-06-14 15:09:33 +02:00
2015-02-06 19:07:29 +01:00
2015-07-26 17:18:35 +02:00
2015-07-22 23:23:29 +02:00
2015-04-29 20:13:59 +02:00
2015-04-18 14:14:24 -03:00
2015-05-06 17:50:09 +02:00
2015-02-08 00:12:46 +01:00
2015-05-28 16:10:56 +02:00
2015-02-14 19:45:23 +00:00
2015-03-14 14:05:25 +01:00
2015-06-06 16:02:19 +00:00
2015-05-28 01:01:16 +02:00
2015-06-19 13:57:36 +02:00
2015-07-22 16:15:53 +02:00
2015-06-28 14:51:07 +02:00
2015-05-25 16:08:08 +02:00
2015-06-24 15:09:31 -07:00
2015-05-20 15:50:58 +02:00
2015-06-17 20:11:43 +02:00
2015-07-01 20:30:48 +02:00
2015-01-17 13:01:26 +01:00
2015-01-15 01:25:16 +01:00
2015-01-22 01:49:04 +01:00
2015-01-22 01:49:04 +01:00
2015-07-27 19:13:48 +02:00
2015-01-13 17:27:45 +01:00
2015-06-26 23:35:26 +02:00
2015-07-22 23:23:29 +02:00
2015-07-10 16:21:50 +02:00
2015-03-16 13:04:47 +01:00
2015-02-06 21:02:08 +01:00
2015-02-14 12:48:41 +00:00
2015-05-13 00:41:38 +02:00
2015-02-04 09:45:41 +00:00
2015-01-19 17:12:09 +01:00