[FFmpeg-cvslog] libvpxenc: switch to ff_alloc_packet2().

Michael Niedermayer git at videolan.org
Thu Mar 22 19:10:30 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 22 15:00:48 2012 +0100| [316defa93c6e2e29bf1223d8ad35dd998a5f44d7] | committer: Michael Niedermayer

libvpxenc: switch to ff_alloc_packet2().

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=316defa93c6e2e29bf1223d8ad35dd998a5f44d7
---

 libavcodec/libvpxenc.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 0aaf547..aee40ef 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -389,7 +389,7 @@ static inline void cx_pktcpy(struct FrameListData *dst,
 static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_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) {
         memcpy(pkt->data, cx_frame->buf, pkt->size);
         pkt->pts = pkt->dts    = cx_frame->pts;
@@ -402,8 +402,6 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
         } else
             coded_frame->pict_type = AV_PICTURE_TYPE_P;
     } else {
-        av_log(avctx, AV_LOG_ERROR,
-               "Error getting output packet of size %zu.\n", cx_frame->sz);
         return ret;
     }
     return pkt->size;



More information about the ffmpeg-cvslog mailing list