Merge commit '2f02bbcca050936686482453078e83dc25493da0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:37:38 +0000 (12:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 11:37:38 +0000 (12:37 +0100)
commit80793afb177ebfbc2d68327d2ca0380acc734cba
tree771c50d689ebf0f963084d6a1f97da85b5cef6ae
parent11146a9b440cd616b3a5ab322cfcca95da2aec7f
parent2f02bbcca050936686482453078e83dc25493da0
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@gmx.at>
configure
libavcodec/Makefile
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c