Commit 5084ed3a authored by Aurelien Jacobs's avatar Aurelien Jacobs

simplify ff_copy_bits: merge 2 test branches

Originally committed as revision 9504 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 98f7b56b
......@@ -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++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment