diff mbox series

[FFmpeg-devel,01/16] avcodec/snowdec: Use ff_snow_common_init() directly

Message ID 20200913025753.274772-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 82b6f4b5563fccfbe21ea1b4e14109ce1f57ef2d
Headers show
Series [FFmpeg-devel,01/16] avcodec/snowdec: Use ff_snow_common_init() directly | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 13, 2020, 2:57 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/snowdec.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

Comments

Michael Niedermayer Sept. 13, 2020, 4:36 p.m. UTC | #1 
On Sun, Sep 13, 2020 at 04:57:38AM +0200, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/snowdec.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)

probably ok

thx

[...]
diff mbox series

Patch

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*/,