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/snowenc.c | |
parent | 439c9760b046caaffceacc08c40692f2e8cb3f03 (diff) | |
parent | d6604b29ef544793479d7fb4e05ef6622bb3e534 (diff) | |
download | ffmpeg-streaming-b1fad7ac200d0779a44fc267085d7d46ce2391b9.zip ffmpeg-streaming-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/snowenc.c')
-rw-r--r-- | libavcodec/snowenc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index bd5c0fd..9c804ac 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -122,8 +122,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ff_set_cmp(&s->mecc, s->mecc.me_sub_cmp, s->avctx->me_sub_cmp); s->input_picture = av_frame_alloc(); - avctx->coded_frame = av_frame_alloc(); - if (!s->input_picture || !avctx->coded_frame) + if (!s->input_picture) return AVERROR(ENOMEM); if ((ret = ff_snow_get_buffer(s, s->input_picture)) < 0) @@ -1852,7 +1851,7 @@ redo_frame: emms_c(); pkt->size = ff_rac_terminate(c); - if (avctx->coded_frame->key_frame) + if (s->current_picture->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; @@ -1866,7 +1865,6 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_snow_common_end(s); ff_rate_control_uninit(&s->m); av_frame_free(&s->input_picture); - av_frame_free(&avctx->coded_frame); av_freep(&avctx->stats_out); return 0; |