virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

libvpxenc: switch to ff_alloc_packet2().

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-22 15:00:48 +01:00
parent 9407cf137f
commit 316defa93c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libvpxenc.c
View File

@ -389,7 +389,7 @@ static inline void cx_pktcpy(struct FrameListData *dst,
static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
AVPacket *pkt, AVFrame *coded_frame) AVPacket *pkt, AVFrame *coded_frame)
{ {
int ret = ff_alloc_packet(pkt, cx_frame->sz); int ret = ff_alloc_packet2(avctx, pkt, cx_frame->sz);
if (ret >= 0) { if (ret >= 0) {
memcpy(pkt->data, cx_frame->buf, pkt->size); memcpy(pkt->data, cx_frame->buf, pkt->size);
pkt->pts = pkt->dts = cx_frame->pts; pkt->pts = pkt->dts = cx_frame->pts;
@ -402,8 +402,6 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
} else } else
coded_frame->pict_type = AV_PICTURE_TYPE_P; coded_frame->pict_type = AV_PICTURE_TYPE_P;
} else { } else {
av_log(avctx, AV_LOG_ERROR,
"Error getting output packet of size %zu.\n", cx_frame->sz);
return ret; return ret;
} }
return pkt->size; return pkt->size;