generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sgidec: fix an incorrect backport

Browse Source 
Bug-Id: 691

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Sean McGovern
2014-06-02 17:42:17 -04:00
committed by Anton Khirnov
parent ba8ab4e7ae
commit 4310ba273d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/sgidec.c
View File

@@ -247,6 +247,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;
@@ -263,15 +265,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,
@@ -280,7 +273,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"),
.capabilities = CODEC_CAP_DR1,
};