ffmpeg/libavfilter
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-07-12 22:33:27 +02:00
2014-02-26 16:37:59 +00:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:40 +01:00
2014-02-26 16:37:59 +00:00
2014-07-03 08:07:42 +00:00
2014-07-03 08:07:42 +00:00
2014-05-03 20:08:18 +02:00
2014-01-19 17:12:50 +01:00
2014-06-29 13:26:04 +02:00
2014-06-03 10:58:19 -08:00
2013-01-05 05:21:44 +01:00
2013-09-30 08:47:40 +00:00
2014-07-03 08:07:42 +00:00
2013-09-12 14:01:43 +00:00
2014-06-22 20:49:00 +02:00
2014-05-20 00:00:44 +02:00
2014-06-24 03:16:53 +02:00
2014-06-03 10:58:19 -08:00
2014-02-07 09:33:56 +01:00
2014-06-18 00:07:12 +02:00
2014-06-03 10:58:19 -08:00
2014-01-19 17:13:02 +01:00