[SCM] libav/experimental: properly set *data_size when returning >= 0 values in shorten_decode_frame() Original thread: Date: Sat, 24 Mar 2007 04:04:53 +0100 Subject: [Ffmpeg-devel] Shorten file playback broken in SVN trunk

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:14 UTC 2013


The following commit has been merged in the experimental branch:
commit ed186431994c98cd7db0aa9b0d92b2493a5e9872
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Mon Mar 26 00:00:43 2007 +0000

    properly set *data_size when returning >= 0 values in shorten_decode_frame()
    Original thread:
    Date: Sat, 24 Mar 2007 04:04:53 +0100
    Subject: [Ffmpeg-devel] Shorten file playback broken in SVN trunk
    
    Originally committed as revision 8523 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 5aea1e1..efb48b5 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -294,6 +294,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
 
         if(buf_size < s->max_framesize){
             //dprintf(avctx, "wanna more data ... %d\n", buf_size);
+            *data_size = 0;
             return input_buf_size;
         }
     }
@@ -471,6 +472,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
                 s->blocksize = get_uint(s, av_log2(s->blocksize));
                 break;
             case FN_QUIT:
+                *data_size = 0;
                 return buf_size;
                 break;
             default:

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list