[FFmpeg-cvslog] Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
Michael Niedermayer
git at videolan.org
Tue Oct 30 15:32:11 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 30 15:22:13 2012 +0100| [6f5f7f705d10e639cf047be216a94de1e39a96e9] | committer: Michael Niedermayer
Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
Remove INIT_AVX from x86inc.asm.
Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
dv: fix indentation
Conflicts:
libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f5f7f705d10e639cf047be216a94de1e39a96e9
---
More information about the ffmpeg-cvslog
mailing list