Commit ef8ab2f9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3b2d0ec4'

* commit '3b2d0ec4':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 914f48dd 3b2d0ec4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment