diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 04:24:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 19:03:19 +0100 |
| commit | 35dfeb871ce76ce8957dda28e3c842f9594f7714 (patch) | |
| tree | c9eae66e50a8962a82b8989893ff49c1b33f2119 /libavcodec/j2kenc.c | |
| parent | e180079c1f48cb5342677f33a7547562f34bc206 (diff) | |
| download | ffmpeg-35dfeb871ce76ce8957dda28e3c842f9594f7714.tar.gz | |
j2kenc: switch to ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kenc.c')
| -rw-r--r-- | libavcodec/j2kenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 3e9017f47b..f201c2cc49 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -27,6 +27,7 @@ #include <float.h> #include "avcodec.h" +#include "internal.h" #include "bytestream.h" #include "j2k.h" #include "libavutil/common.h" @@ -926,9 +927,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int tileno, ret; J2kEncoderContext *s = avctx->priv_data; - if (!pkt->data && - (ret = av_new_packet(pkt, avctx->width*avctx->height*9 + FF_MIN_BUFFER_SIZE)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width*avctx->height*9 + FF_MIN_BUFFER_SIZE)) < 0) { return ret; } |