[SCM] libav/experimental: Use skip_put_bytes in MJPEG encoder instead of filling all bytes with 0 with put_bits.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:13 UTC 2013


The following commit has been merged in the experimental branch:
commit 75ddee0a26172d78a866d47d9be740691b254e49
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Wed Sep 30 10:48:14 2009 +0000

    Use skip_put_bytes in MJPEG encoder instead of filling all bytes with 0
    with put_bits.
    
    Originally committed as revision 20096 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 03c2415..d7a85ee 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -313,11 +313,8 @@ static void escape_FF(MpegEncContext *s, int start)
 
     if(ff_count==0) return;
 
-    /* skip put bits */
-    for(i=0; i<ff_count-3; i+=4)
-        put_bits(&s->pb, 32, 0);
-    put_bits(&s->pb, (ff_count-i)*8, 0);
     flush_put_bits(&s->pb);
+    skip_put_bytes(&s->pb, ff_count);
 
     for(i=size-1; ff_count; i--){
         int v= buf[i];

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list