aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_direct.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-01 12:37:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-01 12:37:38 +0100
commit80793afb177ebfbc2d68327d2ca0380acc734cba (patch)
tree771c50d689ebf0f963084d6a1f97da85b5cef6ae /libavcodec/h264_direct.c
parent11146a9b440cd616b3a5ab322cfcca95da2aec7f (diff)
parent2f02bbcca050936686482453078e83dc25493da0 (diff)
downloadffmpeg-80793afb177ebfbc2d68327d2ca0380acc734cba.tar.gz
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>
Diffstat (limited to 'libavcodec/h264_direct.c')
0 files changed, 0 insertions, 0 deletions