[FFmpeg-cvslog] avcodec/decode: Don't needlessly copy side-data for subtitles
Andreas Rheinhardt
git at videolan.org
Tue Mar 9 16:56:03 EET 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Mar 4 13:49:20 2021 +0100| [b5a2481122c1d85030bc69064248734953e9da88] | committer: Andreas Rheinhardt
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 <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5a2481122c1d85030bc69064248734953e9da88
---
libavcodec/decode.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 750e9e13be..14de70b3f8 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);
}
More information about the ffmpeg-cvslog
mailing list