mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/mpegvideo_enc: Remove always-false checks
In case "!direct" we are not reusing the input buffers (due to e.g. insufficient alignment), but allocating new ones. These of course do not alias with the ones provided by the user, so these checks are always-false. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
b96ba62bdd
commit
5aaaa7dbee
|
@ -1172,11 +1172,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
|
|||
return ret;
|
||||
|
||||
if (!direct) {
|
||||
if (pic->f->data[0] + INPLACE_OFFSET == pic_arg->data[0] &&
|
||||
pic->f->data[1] + INPLACE_OFFSET == pic_arg->data[1] &&
|
||||
pic->f->data[2] + INPLACE_OFFSET == pic_arg->data[2]) {
|
||||
// empty
|
||||
} else {
|
||||
int h_chroma_shift, v_chroma_shift;
|
||||
av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
|
||||
&h_chroma_shift,
|
||||
|
@ -1222,7 +1217,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);
|
||||
|
|
Loading…
Reference in New Issue