diff options
author | Nuo Mi <nuomi2021@gmail.com> | 2025-01-26 11:10:19 +0800 |
---|---|---|
committer | Nuo Mi <nuomi2021@gmail.com> | 2025-01-29 18:22:41 +0800 |
commit | 61ff0fac351d849d014368b5d6ba815deeed287d (patch) | |
tree | 4e1c6e83bcccb0374e347a7330dcb11833d019e9 | |
parent | 3380c0d27df1e07f009e114da98fb8033c2ce33d (diff) | |
download | ffmpeg-61ff0fac351d849d014368b5d6ba815deeed287d.tar.gz |
lavc/vvcdec: remove unneeded set_output_format
Downstream can determine the format from the output frame format
Co-authored-by: Frank Plowman <post@frankplowman.com>
-rw-r--r-- | libavcodec/vvc/dec.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 1cb168de7e..daf537294f 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -961,19 +961,6 @@ fail: return ret; } -static int set_output_format(const VVCContext *s, const AVFrame *output) -{ - AVCodecContext *c = s->avctx; - int ret; - - if (output->width != c->width || output->height != c->height) { - if ((ret = ff_set_dimensions(c, output->width, output->height)) < 0) - return ret; - } - c->pix_fmt = output->format; - return 0; -} - static int wait_delayed_frame(VVCContext *s, AVFrame *output, int *got_output) { VVCFrameContext *delayed = get_frame_context(s, s->fcs, s->nb_frames - s->nb_delayed); @@ -981,9 +968,7 @@ static int wait_delayed_frame(VVCContext *s, AVFrame *output, int *got_output) if (!ret && delayed->output_frame->buf[0] && output) { av_frame_move_ref(output, delayed->output_frame); - ret = set_output_format(s, output); - if (!ret) - *got_output = 1; + *got_output = 1; } s->nb_delayed--; @@ -1034,11 +1019,7 @@ static int get_decoded_frame(VVCContext *s, AVFrame *output, int *got_output) ret = ff_vvc_output_frame(s, last, output, 0, 1); if (ret < 0) return ret; - if (ret) { - *got_output = ret; - if ((ret = set_output_format(s, output)) < 0) - return ret; - } + *got_output = ret; } return 0; } |