diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:37:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:37:38 +0100 |
| commit | 80793afb177ebfbc2d68327d2ca0380acc734cba (patch) | |
| tree | 771c50d689ebf0f963084d6a1f97da85b5cef6ae /libavcodec/sbrdsp.h | |
| parent | 11146a9b440cd616b3a5ab322cfcca95da2aec7f (diff) | |
| parent | 2f02bbcca050936686482453078e83dc25493da0 (diff) | |
| download | ffmpeg-streaming-80793afb177ebfbc2d68327d2ca0380acc734cba.zip ffmpeg-streaming-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/sbrdsp.h')
0 files changed, 0 insertions, 0 deletions
