simplify ff_copy_bits: merge 2 test branches

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9504 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/bitstream.c

@@ -69,9 +69,7 @@ void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
 
     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++)