Message ID | GV1SPRMB0052B7B40D53F50DA561A78D8F212@GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 8fb89790af0ac6de08be7faaa92c41db98358063 |
Headers | show |
Series | [FFmpeg-devel] avcodec/h264_ps: Fix shadowing | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/h264_ps.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c > index dcc51b96db..3c8fc33c7f 100644 > --- a/libavcodec/h264_ps.c > +++ b/libavcodec/h264_ps.c > @@ -522,7 +522,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, > > sps->vui_parameters_present_flag = get_bits1(gb); > if (sps->vui_parameters_present_flag) { > - int ret = decode_vui_parameters(gb, avctx, sps); > + ret = decode_vui_parameters(gb, avctx, sps); > if (ret < 0) > goto fail; > } Will apply. - Andreas
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index dcc51b96db..3c8fc33c7f 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -522,7 +522,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->vui_parameters_present_flag = get_bits1(gb); if (sps->vui_parameters_present_flag) { - int ret = decode_vui_parameters(gb, avctx, sps); + ret = decode_vui_parameters(gb, avctx, sps); if (ret < 0) goto fail; }
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h264_ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)