diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-11 23:35:01 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-04-14 18:38:55 +0200 |
| commit | 4487dd8bb5b3f34cf5d8601a331387f56319f594 (patch) | |
| tree | 4df199b37e9543642accfab80c9a12bab6ada523 /libavcodec | |
| parent | 1764a6887befc11eca91d2f4240e4b0233afc246 (diff) | |
| download | ffmpeg-4487dd8bb5b3f34cf5d8601a331387f56319f594.tar.gz | |
avcodec/mpegvideo_enc: Ignore ICC profile size when not MJPEG
MJPEG is the only mpegvideo-based encoder making use of it.
Fixes linking failures in case mpegvideo_enc.c is compiled
with AMV, LJPEG and MJPEG encoders disabled.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 40bcf09c0b..4a5e5a5059 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1687,8 +1687,11 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, size_t pkt_size = growing_buffer ? FFMAX(s->mb_width*s->mb_height*64+10000, avctx->internal->byte_buffer_size) - AV_INPUT_BUFFER_PADDING_SIZE : s->mb_width*s->mb_height*(MAX_MB_BYTES+100)+10000; - if ((ret = ff_mjpeg_add_icc_profile_size(avctx, s->new_picture, &pkt_size)) < 0) - return ret; + if (CONFIG_MJPEG_ENCODER && avctx->codec_id == AV_CODEC_ID_MJPEG) { + ret = ff_mjpeg_add_icc_profile_size(avctx, s->new_picture, &pkt_size); + if (ret < 0) + return ret; + } if ((ret = ff_alloc_packet(avctx, pkt, pkt_size)) < 0) return ret; if (s->mb_info) { |