mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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 <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
22b0141d87
commit
2a8ac5a780
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user