diff options
| author | Mohamed Tarek <mt@rockbox.org> | 2010-07-17 07:46:38 +0000 |
|---|---|---|
| committer | Mohamed Tarek <mt@rockbox.org> | 2010-07-17 07:46:38 +0000 |
| commit | 090768194fdbd611b995572f424c6fae690eb329 (patch) | |
| tree | 13ec87dee0870933c255490e4e93c3d7feadaf02 /apps/codecs/lib/ffmpeg_bitstream.c | |
| parent | 4a4699692270906976a9bc99d4c11f625fd756c6 (diff) | |
| download | rockbox-090768194fdbd611b995572f424c6fae690eb329.zip rockbox-090768194fdbd611b995572f424c6fae690eb329.tar.gz rockbox-090768194fdbd611b995572f424c6fae690eb329.tar.bz2 rockbox-090768194fdbd611b995572f424c6fae690eb329.tar.xz | |
Enable ff_copy_bits in ffmpeg_bitstream.c and put_bits.h and intreadwrite.h to codeclib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27452 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/lib/ffmpeg_bitstream.c')
| -rw-r--r-- | apps/codecs/lib/ffmpeg_bitstream.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/codecs/lib/ffmpeg_bitstream.c b/apps/codecs/lib/ffmpeg_bitstream.c index be0a3a1..542f267 100644 --- a/apps/codecs/lib/ffmpeg_bitstream.c +++ b/apps/codecs/lib/ffmpeg_bitstream.c @@ -30,7 +30,8 @@ //#include "avcodec.h" #include "ffmpeg_get_bits.h" -//#include "put_bits.h" +#include "ffmpeg_put_bits.h" +#include "ffmpeg_intreadwrite.h" #define av_log(...) @@ -65,6 +66,7 @@ void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) if(terminate_string) put_bits(pb, 8, 0); } +#endif void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) { @@ -74,7 +76,7 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) if(length==0) return; - if(CONFIG_SMALL || words < 16 || put_bits_count(pb)&7){ + if(words < 16 || put_bits_count(pb)&7){ for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(src + 2*i)); }else{ for(i=0; put_bits_count(pb)&31; i++) @@ -86,7 +88,7 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) put_bits(pb, bits, AV_RB16(src + 2*words)>>(16-bits)); } -#endif + /* VLC decoding */ //#define DEBUG_VLC |