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 |
|
Diego Biurrun
|
2d60444331
|
dsputil: Split motion estimation compare bits off into their own context
|
2014-07-17 09:07:10 -07:00 |
|
James Almer
|
dad31083ae
|
x86/svq1enc: port ssd_int8_vs_int16 to yasm
Also add an SSE2 version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-07-05 21:43:40 +02:00 |
|
Michael Niedermayer
|
ea0931fb96
|
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-05-30 00:01:45 +02:00 |
|
Diego Biurrun
|
65d5d58658
|
dsputil: Move SVQ1 encoding specific bits into svq1enc
|
2014-05-29 06:41:15 -07:00 |
|