Merge commit '2d60444331fca1910510038dd3817bea885c2367'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 21:27:40 +0000 (23:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 21:27:40 +0000 (23:27 +0200)
commit3a2d1465c88625774530399b06dc4d48b24bb51f
tree4be7740e2fca1a95af5ec112526c84ca69b64092
parent6be71e9955954422227f9691b4f5367a7169b099
parent2d60444331fca1910510038dd3817bea885c2367
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>
51 files changed:
configure
libavcodec/Makefile
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/arm/Makefile
libavcodec/arm/me_cmp_armv6.S
libavcodec/arm/me_cmp_init_arm.c
libavcodec/dirac_dwt.c
libavcodec/diracdsp.c
libavcodec/dv.h
libavcodec/dvd_nav_parser.c
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/error_resilience.h
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/libavcodec.v
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion-test.c
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideoencdsp.c
libavcodec/ppc/Makefile
libavcodec/ppc/me_cmp.c
libavcodec/proresdec.h
libavcodec/proresdec2.c
libavcodec/proresdsp.h
libavcodec/proresenc_anatoliy.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snow_dwt.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/svq1enc.c
libavcodec/svq1enc.h
libavcodec/utils.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp.asm
libavcodec/x86/me_cmp_init.c
libavfilter/deshake.h
libavfilter/f_select.c
libavfilter/libmpcodecs/vf_fspp.c
libavfilter/vf_deshake.c
libavfilter/vf_mpdecimate.c
libavfilter/vf_spp.c