diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:48:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:55:38 +0100 |
| commit | fe3808eddee81ce4712d1e729fa6fe619f1685c8 (patch) | |
| tree | cedf1b912ffed79311b5beb8b8d9f4196fa261b6 /libavcodec/smacker.c | |
| parent | 9f890a165666a73376c73b3c2bd920345b5c3b79 (diff) | |
| parent | a837c4f2df96a30bf9aa4115b426d608487c7101 (diff) | |
| download | ffmpeg-fe3808eddee81ce4712d1e729fa6fe619f1685c8.tar.gz | |
Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'
* commit 'a837c4f2df96a30bf9aa4115b426d608487c7101':
zmbvenc: use the AVFrame API properly.
flicvideo: use the AVFrame API properly.
smacker: use the AVFrame API properly.
mmvideo: use the AVFrame API properly.
Conflicts:
libavcodec/flicvideo.c
libavcodec/mmvideo.c
libavcodec/smacker.c
libavcodec/zmbvenc.c
See: 76e27b1d0594199b4b1ff8520312069f42373944
See: 099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 3cdb0d58b3..717e9ea033 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -584,6 +584,10 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_PAL8; + c->pic = av_frame_alloc(); + if (!c->pic) + return AVERROR(ENOMEM); + /* decode huffman trees from extradata */ if(avctx->extradata_size < 16){ av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n"); @@ -596,10 +600,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return ret; } - c->pic = av_frame_alloc(); - if (!c->pic) - return AVERROR(ENOMEM); - return 0; } |