[SCM] libav/experimental: 10l patch by (matthieu castet <castet.matthieu free fr>)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:42:43 UTC 2013


The following commit has been merged in the experimental branch:
commit d06c75a8307a3e24868f481c33cd1f43da12b51b
Author: Matthieu Castet <castet.matthieu at free.fr>
Date:   Sun Jan 16 22:11:47 2005 +0000

    10l patch by (matthieu castet <castet.matthieu free fr>)
    
    Originally committed as revision 3842 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index a84ec7e..13c596d 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -1347,7 +1347,7 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b, DWTELEM *src, DWTELE
         put_symbol2(&s->c, b->state[1], run, 3);
         
         for(y=0; y<h; y++){
-            if(&s->c.bytestream_end - &s->c.bytestream < w*40){
+            if(s->c.bytestream_end - s->c.bytestream < w*40){
                 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
                 return -1;
             }
@@ -1923,7 +1923,7 @@ static void encode_blocks(SnowContext *s){
     int h= s->b_height;
 
     for(y=0; y<h; y++){
-        if(&s->c.bytestream_end - &s->c.bytestream < w*MB_SIZE*MB_SIZE*3){ //FIXME nicer limit
+        if(s->c.bytestream_end - s->c.bytestream < w*MB_SIZE*MB_SIZE*3){ //FIXME nicer limit
             av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
             return;
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list