From cadf679bb0ad6d09d451512238e790645262f2f8 Mon Sep 17 00:00:00 2001 From: Davinder Singh Date: Wed, 9 Aug 2017 13:01:07 +0530 Subject: [PATCH] avcodec/mjpegenc: disable unused code with AMV disable unused amv_encode_picture() when AMV encoder is not configured. minor formatting improvement. --- libavcodec/mjpegenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index ee77cde8cb..e6cdaf6376 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -39,7 +39,6 @@ #include "mjpeg.h" #include "mjpegenc.h" - static int alloc_huffman(MpegEncContext *s) { MJpegContext *m = s->mjpeg_ctx; @@ -346,11 +345,11 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]) } } +#if CONFIG_AMV_ENCODER // maximum over s->mjpeg_vsample[i] #define V_MAX 2 static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pic_arg, int *got_packet) - { MpegEncContext *s = avctx->priv_data; AVFrame *pic; @@ -387,6 +386,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, av_frame_free(&pic); return ret; } +#endif #define OFFSET(x) offsetof(MpegEncContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM @@ -403,7 +403,6 @@ FF_MPV_COMMON_OPTS }; #if CONFIG_MJPEG_ENCODER - static const AVClass mjpeg_class = { .class_name = "mjpeg encoder", .item_name = av_default_item_name, @@ -421,12 +420,13 @@ AVCodec ff_mjpeg_encoder = { .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, - .pix_fmts = (const enum AVPixelFormat[]){ + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, .priv_class = &mjpeg_class, }; #endif + #if CONFIG_AMV_ENCODER static const AVClass amv_class = { .class_name = "amv encoder", @@ -444,7 +444,7 @@ AVCodec ff_amv_encoder = { .init = ff_mpv_encode_init, .encode2 = amv_encode_picture, .close = ff_mpv_encode_end, - .pix_fmts = (const enum AVPixelFormat[]){ + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE }, .priv_class = &amv_class, -- 2.13.3