diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 23:43:05 +0200 |
| commit | b1fad7ac200d0779a44fc267085d7d46ce2391b9 (patch) | |
| tree | 8d90c6c835760252979c9739797993f71b36c603 /libavcodec/qtrleenc.c | |
| parent | 439c9760b046caaffceacc08c40692f2e8cb3f03 (diff) | |
| parent | d6604b29ef544793479d7fb4e05ef6622bb3e534 (diff) | |
| download | ffmpeg-b1fad7ac200d0779a44fc267085d7d46ce2391b9.tar.gz | |
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
Gather all coded_frame allocations and free functions to a single place
Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qtrleenc.c')
| -rw-r--r-- | libavcodec/qtrleenc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index bf68d7f242..5fd633a582 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -67,8 +67,6 @@ static av_cold int qtrle_encode_end(AVCodecContext *avctx) { QtrleEncContext *s = avctx->priv_data; - av_frame_free(&avctx->coded_frame); - avpicture_free(&s->previous_frame); av_free(s->rlecode_table); av_free(s->length_table); @@ -128,12 +126,6 @@ static av_cold int qtrle_encode_init(AVCodecContext *avctx) + s->avctx->height*2 /* skip code+rle end */ + s->logical_width/MAX_RLE_BULK + 1 /* rle codes */; - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - qtrle_encode_end(avctx); - return AVERROR(ENOMEM); - } - return 0; } |