[FFmpeg-cvslog] r9504 - trunk/libavcodec/bitstream.c

[aurel]

Author: aurel
Date: Fri Jul  6 16:14:41 2007
New Revision: 9504

Log:
simplify ff_copy_bits: merge 2 test branches

Modified:
   trunk/libavcodec/bitstream.c

Modified: trunk/libavcodec/bitstream.c
==============================================================================
--- trunk/libavcodec/bitstream.c	(original)
+++ trunk/libavcodec/bitstream.c	Fri Jul  6 16:14:41 2007
@@ -69,9 +69,7 @@ void ff_copy_bits(PutBitContext *pb, uin
 
     if(length==0) return;
 
-    if(words < 16){
-        for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
-    }else if(put_bits_count(pb)&7){
+    if(words < 16 || put_bits_count(pb)&7){
         for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
     }else{
         for(i=0; put_bits_count(pb)&31; i++)