RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9c7321e2b8981ec867294309e9cf3833055df78f' into release/0.10 

* commit '9c7321e2b8981ec867294309e9cf3833055df78f':
  sgidec: fix an incorrect backport

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-20 01:32:25 +02:00
parent da97174dcb 9c7321e2b8
commit c1ac5896ef
1 changed files with 2 additions and 10 deletions
Show Stats 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"),
};