[FFmpeg-cvslog] Revert "qpeg: use reget_buffer() in decode_frame()"

Michael Niedermayer git at videolan.org
Thu Apr 28 14:33:28 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 28 04:31:02 2011 +0200| [90bcbc791f431dc7545e837e1a9aeca0a3e760a6] | committer: Michael Niedermayer

Revert "qpeg: use reget_buffer() in decode_frame()"

This reverts commit f4e043ff63935a71b98a36bc98b501c36ceadb92.

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

 libavcodec/qpeg.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 8c1b7e0..dda5525 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -259,9 +259,12 @@ static int decode_frame(AVCodecContext *avctx,
     int delta;
     const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
-    p->reference = 3;
-    if (avctx->reget_buffer(avctx, p) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+    if(p->data[0])
+        avctx->release_buffer(avctx, p);
+
+    p->reference= 0;
+    if(avctx->get_buffer(avctx, p) < 0){
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
     outdata = a->pic.data[0];



More information about the ffmpeg-cvslog mailing list