Michael Niedermayer 60a0bc46cd Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc' ...

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

Conflicts:
	libavcodec/x86/Makefile

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

2013-02-07 13:35:49 +01:00

1.6 KiB

Raw Blame History

View Raw