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 | |
| 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')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/huffyuvdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/huffyuvenc.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1c1f8dd..4614a39 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -202,8 +202,6 @@ OBJS-$(CONFIG_EVRC_DECODER) += evrcdec.o acelp_vectors.o lsp.o OBJS-$(CONFIG_EXR_DECODER) += exr.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o -OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o huffyuvdec.o -OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o OBJS-$(CONFIG_FIC_DECODER) += fic.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.o diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 811347a..6ab12c4 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 = { diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index aa5e2cb..2a50a1b 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -988,7 +988,6 @@ static av_cold int encode_end(AVCodecContext *avctx) return 0; } -#if CONFIG_HUFFYUV_ENCODER AVCodec ff_huffyuv_encoder = { .name = "huffyuv", .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), @@ -1004,7 +1003,6 @@ AVCodec ff_huffyuv_encoder = { AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, }; -#endif #if CONFIG_FFVHUFF_ENCODER AVCodec ff_ffvhuff_encoder = { |
