Skip to content
Snippets Groups Projects
Commit 6f5f7f70 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '08b028c1' 


* commit '08b028c1':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e79c3858 08b028c1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment