diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 4126756e9b..9ee38b8447 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -246,7 +246,7 @@ static int alloc_picture_tables(AVCodecContext *avctx, Picture *pic, int encodin * The pixels are allocated/set by calling get_buffer() if shared = 0 */ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, - ScratchpadContext *sc, int shared, int encoding, + ScratchpadContext *sc, int encoding, int chroma_x_shift, int chroma_y_shift, int out_format, int mb_stride, int mb_width, int mb_height, int b8_stride, ptrdiff_t *linesize, ptrdiff_t *uvlinesize) @@ -258,10 +258,6 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, || pic->alloc_mb_height != mb_height) free_picture_tables(pic); - if (shared) { - av_assert0(pic->f->data[0]); - pic->shared = 1; - } else { av_assert0(!pic->f->buf[0]); if (alloc_frame_buffer(avctx, pic, me, sc, chroma_x_shift, chroma_y_shift, @@ -270,7 +266,6 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, *linesize = pic->f->linesize[0]; *uvlinesize = pic->f->linesize[1]; - } if (!pic->qscale_table_buf) ret = alloc_picture_tables(avctx, pic, encoding, out_format, diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index aca7150efb..9a4a1f5af3 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -86,7 +86,7 @@ typedef struct Picture { * The pixels are allocated/set by calling get_buffer() if shared = 0. */ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, - ScratchpadContext *sc, int shared, int encoding, + ScratchpadContext *sc, int encoding, int chroma_x_shift, int chroma_y_shift, int out_format, int mb_stride, int mb_width, int mb_height, int b8_stride, ptrdiff_t *linesize, ptrdiff_t *uvlinesize); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index b4ecb56987..07febcfe55 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -236,7 +236,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) static int alloc_picture(MpegEncContext *s, Picture *pic) { - return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, 0, + return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->chroma_x_shift, s->chroma_y_shift, s->out_format, s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, &s->linesize, &s->uvlinesize); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index daf8b4992c..9106014aa5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1091,9 +1091,9 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src, return acc; } -static int alloc_picture(MpegEncContext *s, Picture *pic, int shared) +static int alloc_picture(MpegEncContext *s, Picture *pic) { - return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, shared, 1, + return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 1, s->chroma_x_shift, s->chroma_y_shift, s->out_format, s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, &s->linesize, &s->uvlinesize); @@ -1164,12 +1164,12 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) if (direct) { if ((ret = av_frame_ref(pic->f, pic_arg)) < 0) return ret; - } - ret = alloc_picture(s, pic, direct); - if (ret < 0) - return ret; + pic->shared = 1; + } else { + ret = alloc_picture(s, pic); + if (ret < 0) + return ret; - if (!direct) { for (int i = 0; i < 3; i++) { int src_stride = pic_arg->linesize[i]; int dst_stride = i ? s->uvlinesize : s->linesize; @@ -1596,7 +1596,7 @@ no_output_pic: pic = &s->picture[i]; pic->reference = s->reordered_input_picture[0]->reference; - ret = alloc_picture(s, pic, 0); + ret = alloc_picture(s, pic); if (ret < 0) goto fail;