projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98f7b56
)
simplify ff_copy_bits: merge 2 test branches
author
Aurelien Jacobs
<aurel@gnuage.org>
Fri, 6 Jul 2007 14:14:41 +0000
(14:14 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Fri, 6 Jul 2007 14:14:41 +0000
(14:14 +0000)
Originally committed as revision 9504 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/bitstream.c
patch
|
blob
|
history
diff --git
a/libavcodec/bitstream.c
b/libavcodec/bitstream.c
index
79a3f6c
..
a69e20d
100644
(file)
--- 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++)