[FFmpeg-cvslog] Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 22:04:51 2014 +0100| [1618f162a9daa1048c08eefe8086f78ea45e3647] | committer: Michael Niedermayer

Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
	libavcodec/Makefile

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

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