From: Andreas Rheinhardt Date: Thu, 4 Mar 2021 12:49:20 +0000 (+0100) Subject: avcodec/decode: Don't needlessly copy side-data for subtitles X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b5a2481122c1d85030bc69064248734953e9da88;p=ffmpeg avcodec/decode: Don't needlessly copy side-data for subtitles AVCodecInternal.last_pkt_props is not used when decoding subtitles; ergo it makes no sense to set it at all. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 750e9e13bee..14de70b3f8a 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1050,10 +1050,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, if (ret < 0) return ret; - ret = extract_packet_props(avctx->internal, pkt); - if (ret < 0) - goto cleanup; - if (avctx->pkt_timebase.num && avpkt->pts != AV_NOPTS_VALUE) sub->pts = av_rescale_q(avpkt->pts, avctx->pkt_timebase, AV_TIME_BASE_Q); @@ -1099,7 +1095,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, if (*got_sub_ptr) avctx->frame_number++; - cleanup: if (pkt == avci->buffer_pkt) // did we recode? av_packet_unref(avci->buffer_pkt); }