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

Merge commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5' into release/1.1

Browse Source 
* commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5':
  sgidec: fix an incorrect backport

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-20 01:22:12 +02:00
parent 62899d79a3 4310ba273d
commit 724deeb7a8
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

@@ -249,6 +249,8 @@ static int decode_frame(AVCodecContext *avctx,
static av_cold int sgi_init(AVCodecContext *avctx){ static av_cold int sgi_init(AVCodecContext *avctx){
SgiState *s = avctx->priv_data; SgiState *s = avctx->priv_data;
s->avctx = avctx;
avcodec_get_frame_defaults(&s->picture); avcodec_get_frame_defaults(&s->picture);
avctx->coded_frame = &s->picture; avctx->coded_frame = &s->picture;
@@ -265,15 +267,6 @@ static av_cold int sgi_end(AVCodecContext *avctx)
return 0; 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 = { AVCodec ff_sgi_decoder = {
.name = "sgi", .name = "sgi",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
@@ -283,6 +276,5 @@ AVCodec ff_sgi_decoder = {
.close = sgi_end, .close = sgi_end,
.decode = decode_frame, .decode = decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("SGI image"), .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
.init = sgi_decode_init,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
}; };