changeset 5230:2a340aea762d libavcodec

simplify ff_copy_bits: merge 2 test branches
author aurel
date Fri, 06 Jul 2007 14:14:41 +0000
parents 604a09d6cf2e
children 07a97575d0c4
files bitstream.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bitstream.c	Fri Jul 06 14:13:25 2007 +0000
+++ b/bitstream.c	Fri Jul 06 14:14:41 2007 +0000
@@ -69,9 +69,7 @@
 
     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++)