Michael Niedermayer b4f64c58fc Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f' ...

* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
  dsputil: Move RV40-specific bits into rv40dsp

Conflicts:
	libavcodec/dsputil.c
	libavcodec/rv40dsp.c

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

2014-03-26 15:24:50 +01:00

30 KiB

Raw Blame History

View Raw