ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Dec  6 
01:46:39 2014 +0100| [1d048f762d2fc4ede5316818f467e2f1d1065ac1] | committer: 
Michael Niedermayer

Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'

* commit '9a738c27dceb4b975784b23213a46f5cb560d1c2':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
        libavcodec/v210enc.c
        libavcodec/v210enc.h
        libavcodec/x86/Makefile
        libavcodec/x86/v210enc.asm
        libavcodec/x86/v210enc_init.c
        tests/ref/vsynth/vsynth1-v210
        tests/ref/vsynth/vsynth2-v210

See: 36091742d182b3ad4411aae22682354b3834a974
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to