Commit 60a0bc46 authored 12 years ago by Michael Niedermayer

Merge commit 'a846dccb'


* commit 'a846dccb':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
	libavcodec/x86/Makefile

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

parents c4e394e4 a846dccb

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 30 additions and 26 deletions

Please register or to comment