• Michael Niedermayer's avatar
    Merge commit '2d604443' · 3a2d1465
    Michael Niedermayer authored
    * commit '2d604443':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3a2d1465
mpegvideo_enc.c 167 KB