diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 17:49:04 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 17:49:47 +0300 |
commit | 50e46b7f0dca4d974f4c092f663bbbcf5f3d5e99 (patch) | |
tree | fcfbdc2145a0cd156bd184d278cb4e3f297e4571 | |
parent | 36f862e04c2afe37c1fd541e01013c6cef4c6015 (diff) | |
parent | a09c499a2e25ded575cb9f37528384402be86ad8 (diff) |
Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'
* commit 'a09c499a2e25ded575cb9f37528384402be86ad8':
rawenc: properly allocate coded_frame
Conflicts:
libavcodec/rawenc.c
See: 881f96c4c2ef0c0162f63a370cbfff3c1e1feb2a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/rawenc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index c579230013..d7923931bb 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -35,7 +35,10 @@ static av_cold int raw_encode_init(AVCodecContext *avctx) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - avctx->coded_frame = av_frame_alloc(); + avctx->coded_frame = av_frame_alloc(); + if (!avctx->coded_frame) + return AVERROR(ENOMEM); + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc); if(!avctx->codec_tag) @@ -68,7 +71,7 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int raw_close(AVCodecContext *avctx) +static av_cold int raw_encode_close(AVCodecContext *avctx) { av_frame_free(&avctx->coded_frame); return 0; @@ -80,6 +83,6 @@ AVCodec ff_rawvideo_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_RAWVIDEO, .init = raw_encode_init, + .close = raw_encode_close, .encode2 = raw_encode, - .close = raw_close, }; |