virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/vp56: Avoid functions with only one caller

Browse Source 
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-02-11 09:03:30 +01:00
parent ac9f8d7c02
commit ac6c1080cd
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/vp5.c
View File

@@ -282,7 +282,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx)
VP56Context *s = avctx->priv_data; VP56Context *s = avctx->priv_data;
int ret; int ret;
if ((ret = ff_vp56_init(avctx, 1, 0)) < 0) if ((ret = ff_vp56_init_context(avctx, s, 1, 0)) < 0)
return ret; return ret;
ff_vp5dsp_init(&s->vp56dsp); ff_vp5dsp_init(&s->vp56dsp);
s->vp56_coord_div = vp5_coord_div; s->vp56_coord_div = vp5_coord_div;
@@ -296,6 +296,12 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static av_cold int vp56_free(AVCodecContext *avctx)
{
VP56Context *const s = avctx->priv_data;
return ff_vp56_free_context(s);
}
const AVCodec ff_vp5_decoder = { const AVCodec ff_vp5_decoder = {
.name = "vp5", .name = "vp5",
.long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
@@ -303,7 +309,7 @@ const AVCodec ff_vp5_decoder = {
.id = AV_CODEC_ID_VP5, .id = AV_CODEC_ID_VP5,
.priv_data_size = sizeof(VP56Context), .priv_data_size = sizeof(VP56Context),
.init = vp5_decode_init, .init = vp5_decode_init,
.close = ff_vp56_free, .close = vp56_free,
.decode = ff_vp56_decode_frame, .decode = ff_vp56_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,

12
libavcodec/vp56.c
View File

@@ -773,12 +773,6 @@ next:
return 0; return 0;
} }
av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
{
VP56Context *s = avctx->priv_data;
return ff_vp56_init_context(avctx, s, flip, has_alpha);
}
av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s,
int flip, int has_alpha) int flip, int has_alpha)
{ {
@@ -830,12 +824,6 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s,
return 0; return 0;
} }
av_cold int ff_vp56_free(AVCodecContext *avctx)
{
VP56Context *s = avctx->priv_data;
return ff_vp56_free_context(s);
}
av_cold int ff_vp56_free_context(VP56Context *s) av_cold int ff_vp56_free_context(VP56Context *s)
{ {
int i; int i;

2
libavcodec/vp56.h
View File

@@ -216,14 +216,12 @@ struct vp56_context {
}; };
int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
/** /**
* Initializes an VP56Context. Expects its caller to clean up * Initializes an VP56Context. Expects its caller to clean up
* in case of error. * in case of error.
*/ */
int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s,
int flip, int has_alpha); int flip, int has_alpha);
int ff_vp56_free(AVCodecContext *avctx);
int ff_vp56_free_context(VP56Context *s); int ff_vp56_free_context(VP56Context *s);
void ff_vp56_init_dequant(VP56Context *s, int quantizer); void ff_vp56_init_dequant(VP56Context *s, int quantizer);
int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,