diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-06 14:14:41 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-06 14:14:41 +0000 |
| commit | 5084ed3a9f576654c7f31d48dcaa63b1d5e8724b (patch) | |
| tree | 92e6c0dd459ca7111cab4961ece61406d292a850 | |
| parent | 98f7b56bb6562db841219a42ea4e15d43a835c93 (diff) | |
| download | ffmpeg-5084ed3a9f576654c7f31d48dcaa63b1d5e8724b.tar.gz | |
simplify ff_copy_bits: merge 2 test branches
Originally committed as revision 9504 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 79a3f6c2f1..a69e20d42f 100644 --- a/libavcodec/bitstream.c +++ b/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++) |