ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Jul 17 
23:27:40 2014 +0200| [3a2d1465c88625774530399b06dc4d48b24bb51f] | committer: 
Michael Niedermayer

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 <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a2d1465c88625774530399b06dc4d48b24bb51f
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to