Michael Niedermayer daded4f89a Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5' ...

* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
	configure
	libavcodec/ffv1.c

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

2014-03-13 21:26:49 +01:00

5.6 KiB

Raw Blame History

View Raw