mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-05-11 21:42:44 +02:00
6f5f7f705d
* 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@gmx.at>