diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-13 21:07:31 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-13 21:07:31 +0000 |
commit | a734250db6d0ddce959ff472cfef0b682817c6aa (patch) | |
tree | 44bda203cf58b1262a777dd59060cfc02084ba29 | |
parent | cfbd16df75e6eacd9d797b5a06f347c832d6a757 (diff) | |
download | ffmpeg-a734250db6d0ddce959ff472cfef0b682817c6aa.tar.gz |
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
Originally committed as revision 2775 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/mpegvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index dfb4dd4850..6c483dcc81 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -3738,13 +3738,13 @@ void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) if(length==0) return; -// if(put_bits_count(pb)&7){ //FIXME + if(put_bits_count(pb)&7){ for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(((uint16_t*)src)[i])); -/* }else{ + }else{ flush_put_bits(pb); memcpy(pbBufPtr(pb), src, 2*words); skip_put_bytes(pb, 2*words); - }*/ + } put_bits(pb, bits, be2me_16(((uint16_t*)src)[words])>>(16-bits)); } |