[FFmpeg-cvslog] Merge commit '2f02bbcca050936686482453078e83dc25493da0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 12:37:38 2014 +0100| [80793afb177ebfbc2d68327d2ca0380acc734cba] | committer: Michael Niedermayer

Merge commit '2f02bbcca050936686482453078e83dc25493da0'

* commit '2f02bbcca050936686482453078e83dc25493da0':
  build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder

Conflicts:
	configure
	libavcodec/Makefile

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

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