[FFmpeg-cvslog] Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:26:49 2014 +0100| [daded4f89a7762a685ae3b5119eec14fc24192a9] | committer: Michael Niedermayer

Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'

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

Conflicts:
	configure
	libavcodec/ffv1.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daded4f89a7762a685ae3b5119eec14fc24192a9
---