diff options
| author | Sean McGovern <gseanmcg@gmail.com> | 2014-06-02 17:42:17 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-06-17 21:44:38 +0200 |
| commit | 4310ba273d3bcb7f19a4e40b55b9e832568e56e5 (patch) | |
| tree | f4ffefbbf34fc29cb459da4f4e9db8ef1b5677b0 | |
| parent | ba8ab4e7ae016cf970b0f335a7933f2db53784bc (diff) | |
| download | ffmpeg-4310ba273d3bcb7f19a4e40b55b9e832568e56e5.tar.gz | |
sgidec: fix an incorrect backport
Bug-Id: 691
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/sgidec.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 94de9fdcd1..4799e831e3 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -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, }; |