[SCM] libav/experimental: activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:39:12 UTC 2013


The following commit has been merged in the experimental branch:
commit a734250db6d0ddce959ff472cfef0b682817c6aa
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Feb 13 21:07:31 2004 +0000

    activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
    
    Originally committed as revision 2775 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index dfb4dd4..6c483dc 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -3738,13 +3738,13 @@ void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
 
     if(length==0) return;
     
-//    if(put_bits_count(pb)&7){ //FIXME
+    if(put_bits_count(pb)&7){
         for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(((uint16_t*)src)[i]));
-/*    }else{
+    }else{
         flush_put_bits(pb);
         memcpy(pbBufPtr(pb), src, 2*words);
         skip_put_bytes(pb, 2*words);
-    }*/
+    }
         
     put_bits(pb, bits, be2me_16(((uint16_t*)src)[words])>>(16-bits));
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list