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/huffyuvdec.c | |
| parent | 11146a9b440cd616b3a5ab322cfcca95da2aec7f (diff) | |
| parent | 2f02bbcca050936686482453078e83dc25493da0 (diff) | |
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/huffyuvdec.c')
| -rw-r--r-- | libavcodec/huffyuvdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 811347a134..6ab12c475e 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -1098,7 +1098,6 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } -#if CONFIG_HUFFYUV_DECODER AVCodec ff_huffyuv_decoder = { .name = "huffyuv", .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), @@ -1112,7 +1111,6 @@ AVCodec ff_huffyuv_decoder = { CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), }; -#endif #if CONFIG_FFVHUFF_DECODER AVCodec ff_ffvhuff_decoder = { |