Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Mar 2013 10:32:45 +0000 (11:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Mar 2013 10:32:45 +0000 (11:32 +0100)
commitef8ab2f953079106bb4d72f9ce0af9c38f919130
tree27f03e3bde89a6bfc592dbe288f384c8e81aec2f
parent914f48ddf0226c2fabcd46cedd90fc622fef4019
parent3b2d0ec473b036bdd0a5bc0d896fd5292915f44d
Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

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

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/vc1dsp_mmx.c