[FFmpeg-cvslog] 4xm: use reget_buffer() in decode_frame()

Stefano Sabatini git at videolan.org
Wed Apr 27 12:11:09 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Tue Apr 26 11:59:22 2011 +0200| [10aa5a6c429827b8f2cd5a04680a8d24d5ad8b53] | committer: Stefano Sabatini

4xm: use reget_buffer() in decode_frame()

Also remove unnecessary call to avctx->release_buffer(). reget_buffer
is required since apparently the codec needs to be feeded with the
previous frame data.

Releasing the frame and using get_buffer was working only in the case
get_buffer() was returning the old frame data, and resulting in
playback artifacts otherwise.

Fix trac issue #85.

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

 libavcodec/4xm.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 97436ce..3a42642 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -773,12 +773,9 @@ static int decode_frame(AVCodecContext *avctx,
 
     avctx->flags |= CODEC_FLAG_EMU_EDGE; // alternatively we would have to use our own buffer management
 
-    if(p->data[0])
-        avctx->release_buffer(avctx, p);
-
     p->reference= 1;
-    if(avctx->get_buffer(avctx, p) < 0){
-        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+    if (avctx->reget_buffer(avctx, p) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return -1;
     }
 



More information about the ffmpeg-cvslog mailing list