Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

Browse Source

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/13/merge

Michael Niedermayer 12 years ago

parent 914f48ddf0 3b2d0ec473

commit ef8ab2f953

1 changed files with 42 additions and 42 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save