[FFmpeg-cvslog] Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:35:56 2014 +0100| [96b02460fce59edca54fa2992c2d6e431596df9e] | committer: Michael Niedermayer

Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'

* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8':
  configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:
	configure

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

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