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
Michael Niedermayer
1bc85fb32d
dirac: mark some variables const.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-15 22:12:02 +01:00
Michael Niedermayer
c0dbab964d
dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 02:47:23 +01:00
Michael Niedermayer
e8b891b7f0
dirac: enable diracdsp_mmx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:28:48 +01:00
Jordi Ortiz
49aa397414
Dirac: More formating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:17 +01:00
multiple authors
5d50fcc549
DIRAC Decoder stable version, MMX support removed.
...
Look for MMX_DISABLED to find the disabled functions.
Authors of this code are Marco Gerards <marco@gnu.org> and David Conrad <lessen42@gmail.com>
With changes from Jordi Ortiz <nenjordi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:08 +01:00
