ffmpeg | branch: master | Andreas Rheinhardt <[email protected]> | Fri Oct 6 01:13:42 2023 +0200| [2a8ac5a780539022b77d80a01ec102dec98df763] | committer: Andreas Rheinhardt
avcodec/mpegvideo_enc: Don't call av_frame_copy_props() unnecessarily It is unnecessary in case of user-supplied frames, because it happens directly after a av_frame_ref() with the same src and dst. Signed-off-by: Andreas Rheinhardt <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a8ac5a780539022b77d80a01ec102dec98df763 --- libavcodec/mpegvideo_enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9106014aa5..b044fce5cd 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1169,6 +1169,11 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) ret = alloc_picture(s, pic); if (ret < 0) return ret; + ret = av_frame_copy_props(pic->f, pic_arg); + if (ret < 0) { + ff_mpeg_unref_picture(s->avctx, pic); + return ret; + } for (int i = 0; i < 3; i++) { int src_stride = pic_arg->linesize[i]; @@ -1210,11 +1215,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) } emms_c(); } - ret = av_frame_copy_props(pic->f, pic_arg); - if (ret < 0) { - ff_mpeg_unref_picture(s->avctx, pic); - return ret; - } pic->display_picture_number = display_picture_number; pic->f->pts = pts; // we set this here to avoid modifying pic_arg _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
