[FFmpeg-cvslog] avcodec/snowdec: Use ff_snow_common_init() directly

Andreas Rheinhardt git at videolan.org
Mon Sep 14 16:53:14 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Sep 12 23:40:02 2020 +0200| [82b6f4b5563fccfbe21ea1b4e14109ce1f57ef2d] | committer: Andreas Rheinhardt

avcodec/snowdec: Use ff_snow_common_init() directly

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82b6f4b5563fccfbe21ea1b4e14109ce1f57ef2d
---

 libavcodec/snowdec.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 5e69f39022..68afe0df26 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -422,17 +422,6 @@ static int decode_header(SnowContext *s){
     return 0;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx)
-{
-    int ret;
-
-    if ((ret = ff_snow_common_init(avctx)) < 0) {
-        return ret;
-    }
-
-    return 0;
-}
-
 static int decode_blocks(SnowContext *s){
     int x, y;
     int w= s->b_width;
@@ -665,7 +654,7 @@ AVCodec ff_snow_decoder = {
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_SNOW,
     .priv_data_size = sizeof(SnowContext),
-    .init           = decode_init,
+    .init           = ff_snow_common_init,
     .close          = decode_end,
     .decode         = decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,



More information about the ffmpeg-cvslog mailing list