Michael Niedermayer
3a2d1465c8
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
dsputil: Split motion estimation compare bits off into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 23:27:40 +02:00
..
2014-04-05 19:05:00 +02:00
2014-04-05 19:36:21 +02:00
2014-06-22 19:53:09 +02:00
2014-06-22 19:53:09 +02:00
2014-07-05 19:50:05 +02:00
2014-07-01 15:43:40 +02:00
2014-06-23 13:31:26 +02:00
2014-06-23 22:11:18 +02:00
2014-05-07 15:02:45 +02:00
2014-07-01 15:22:11 +02:00
2014-06-08 02:37:20 +02:00
2014-06-08 02:37:20 +02:00
2014-04-13 11:29:28 +02:00
2014-04-13 11:29:28 +02:00
2014-06-09 00:51:43 +02:00
2014-06-09 19:32:41 +02:00
2014-07-17 22:07:52 +02:00
2014-07-17 22:07:52 +02:00
2014-04-11 12:09:09 +02:00
2014-04-11 12:09:09 +02:00
2014-07-08 03:19:06 +02:00
2014-05-21 03:25:08 +02:00
2014-05-26 15:37:04 +02:00
2014-07-01 15:43:40 +02:00
2014-07-01 15:43:40 +02:00
2014-05-07 15:02:45 +02:00
2014-04-17 14:15:09 +02:00
2014-07-01 15:43:40 +02:00
2014-07-01 15:43:40 +02:00
2014-06-24 02:13:43 +02:00
2014-05-26 15:37:04 +02:00
2014-04-05 19:16:39 +02:00
2014-06-26 02:58:59 +02:00
2014-07-13 13:48:31 +02:00
2014-06-25 18:22:25 +02:00
2014-06-01 23:34:33 +02:00
2014-07-13 13:48:31 +02:00
2014-06-25 14:49:44 +02:00
2014-05-26 15:37:04 +02:00
2014-03-26 14:50:55 +01:00
2014-05-29 21:47:40 +02:00
2014-05-26 15:37:04 +02:00
2014-07-05 19:11:26 +02:00
2014-06-15 13:19:27 +02:00
2014-05-28 00:03:59 +02:00
2014-07-01 15:22:11 +02:00
2014-07-01 15:22:11 +02:00
2014-07-01 15:22:11 +02:00
2014-07-01 15:22:11 +02:00
2014-07-02 01:08:04 +02:00
2014-07-01 15:22:11 +02:00
2014-03-22 22:11:27 +01:00
2014-06-05 20:31:59 +02:00
2014-06-05 20:31:59 +02:00
2014-05-29 19:50:44 +02:00
2014-06-19 05:53:41 +02:00
2014-05-07 15:02:45 +02:00
2014-07-17 23:27:40 +02:00
2014-04-19 09:56:01 +02:00
2014-07-17 23:27:40 +02:00
2014-07-17 23:27:40 +02:00
2014-05-06 14:15:02 +02:00
2014-04-05 19:05:00 +02:00
2014-06-23 21:10:10 +02:00
2014-07-07 15:08:55 +02:00
2014-07-04 01:17:39 +02:00
2014-07-04 01:17:39 +02:00
2014-07-07 16:17:27 +02:00
2014-07-07 15:36:58 +02:00
2014-07-10 01:22:14 +02:00
2014-07-10 01:22:14 +02:00
2014-07-01 15:22:11 +02:00
2014-05-30 04:05:29 +02:00
2014-05-30 02:43:34 +02:00
2014-03-22 22:11:27 +01:00
2014-06-20 21:36:43 +02:00
2014-07-01 15:43:40 +02:00
2014-05-15 23:11:18 +02:00
2014-05-15 23:11:18 +02:00
2014-07-01 15:22:11 +02:00
2014-07-17 22:07:52 +02:00
2014-07-05 21:43:40 +02:00
2014-07-06 20:27:57 +02:00
2014-04-22 14:01:53 +02:00
2014-05-21 03:25:08 +02:00
2014-06-28 05:39:07 +02:00
2014-06-28 05:39:07 +02:00
2014-04-05 19:16:39 +02:00
2014-04-19 09:56:01 +02:00
2014-07-01 15:43:40 +02:00
2014-07-01 15:43:40 +02:00
2014-07-01 15:43:40 +02:00
2014-06-08 02:37:20 +02:00
2014-07-01 15:43:40 +02:00
2014-04-20 21:33:58 +02:00
2014-03-29 18:13:15 +01:00
2014-04-19 09:56:01 +02:00