[FFmpeg-cvslog] Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:10:30 2014 +0100| [ecf16f039def26e028a4413ea94a32166e351a46] | committer: Michael Niedermayer

Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421'

* commit '7d7be44f3e8bc14224540a477ef0607f18964421':
  build: Drop stray PNG decoder dependency on dsputil

Conflicts:
	configure

No change as the stray dependency was not in our configure

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

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