[SCM] libav/wheezy-security: sgidec: fix an incorrect backport

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit 9c7321e2b8981ec867294309e9cf3833055df78f
Author: Sean McGovern <gseanmcg at gmail.com>
Date:   Mon Jun 2 18:35:25 2014 -0400

    sgidec: fix an incorrect backport
    
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index 13f505a..6aaa514 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -246,6 +246,8 @@ static int decode_frame(AVCodecContext *avctx,
 static av_cold int sgi_init(AVCodecContext *avctx){
     SgiState *s = avctx->priv_data;
 
+    s->avctx = avctx;
+
     avcodec_get_frame_defaults(&s->picture);
     avctx->coded_frame = &s->picture;
 
@@ -262,15 +264,6 @@ static av_cold int sgi_end(AVCodecContext *avctx)
     return 0;
 }
 
-static av_cold int sgi_decode_init(AVCodecContext *avctx)
-{
-    SgiState *s = avctx->priv_data;
-
-    s->avctx = avctx;
-
-    return 0;
-}
-
 AVCodec ff_sgi_decoder = {
     .name           = "sgi",
     .type           = AVMEDIA_TYPE_VIDEO,
@@ -279,7 +272,6 @@ AVCodec ff_sgi_decoder = {
     .init           = sgi_init,
     .close          = sgi_end,
     .decode         = decode_frame,
-    .init           = sgi_decode_init,
     .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
 };
 

-- 
Libav/FFmpeg packaging