Message ID | AM7PR03MB666096344978497B2308E9148F679@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 5e7bdbfff6b99ea61254b048605aca3cb349ddb1 |
Headers | show |
Series | [FFmpeg-devel,1/3] avcodec/h264_redundant_pps_bsf: Remove flush callback | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > extradata_pic_init_qp is unset since > fa75e438756f159a667080dcba58ea2e3b190001 > (and resetting current_pic_init_qp to the value it had in extradata > never made much sense). > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/h264_redundant_pps_bsf.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c > index fb678beef3..4b2831fb04 100644 > --- a/libavcodec/h264_redundant_pps_bsf.c > +++ b/libavcodec/h264_redundant_pps_bsf.c > @@ -33,7 +33,6 @@ typedef struct H264RedundantPPSContext { > > int global_pic_init_qp; > int current_pic_init_qp; > - int extradata_pic_init_qp; > } H264RedundantPPSContext; > > > @@ -111,12 +110,6 @@ static int h264_redundant_pps_update_fragment(AVBSFContext *bsf, > return 0; > } > > -static void h264_redundant_pps_flush(AVBSFContext *bsf) > -{ > - H264RedundantPPSContext *ctx = bsf->priv_data; > - ctx->current_pic_init_qp = ctx->extradata_pic_init_qp; > -} > - > static const CBSBSFType h264_redundant_pps_type = { > .codec_id = AV_CODEC_ID_H264, > .fragment_name = "access unit", > @@ -141,7 +134,6 @@ const AVBitStreamFilter ff_h264_redundant_pps_bsf = { > .name = "h264_redundant_pps", > .priv_data_size = sizeof(H264RedundantPPSContext), > .init = &h264_redundant_pps_init, > - .flush = &h264_redundant_pps_flush, > .close = &ff_cbs_bsf_generic_close, > .filter = &ff_cbs_bsf_generic_filter, > .codec_ids = h264_redundant_pps_codec_ids, > Will apply later unless there are objections. - Andreas
diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index fb678beef3..4b2831fb04 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -33,7 +33,6 @@ typedef struct H264RedundantPPSContext { int global_pic_init_qp; int current_pic_init_qp; - int extradata_pic_init_qp; } H264RedundantPPSContext; @@ -111,12 +110,6 @@ static int h264_redundant_pps_update_fragment(AVBSFContext *bsf, return 0; } -static void h264_redundant_pps_flush(AVBSFContext *bsf) -{ - H264RedundantPPSContext *ctx = bsf->priv_data; - ctx->current_pic_init_qp = ctx->extradata_pic_init_qp; -} - static const CBSBSFType h264_redundant_pps_type = { .codec_id = AV_CODEC_ID_H264, .fragment_name = "access unit", @@ -141,7 +134,6 @@ const AVBitStreamFilter ff_h264_redundant_pps_bsf = { .name = "h264_redundant_pps", .priv_data_size = sizeof(H264RedundantPPSContext), .init = &h264_redundant_pps_init, - .flush = &h264_redundant_pps_flush, .close = &ff_cbs_bsf_generic_close, .filter = &ff_cbs_bsf_generic_filter, .codec_ids = h264_redundant_pps_codec_ids,
extradata_pic_init_qp is unset since fa75e438756f159a667080dcba58ea2e3b190001 (and resetting current_pic_init_qp to the value it had in extradata never made much sense). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h264_redundant_pps_bsf.c | 8 -------- 1 file changed, 8 deletions(-)