diff options
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 be0a3a11f6..542f2671e5 100644 --- a/apps/codecs/lib/ffmpeg_bitstream.c +++ b/apps/codecs/lib/ffmpeg_bitstream.c | |||
@@ -30,7 +30,8 @@ | |||
30 | 30 | ||
31 | //#include "avcodec.h" | 31 | //#include "avcodec.h" |
32 | #include "ffmpeg_get_bits.h" | 32 | #include "ffmpeg_get_bits.h" |
33 | //#include "put_bits.h" | 33 | #include "ffmpeg_put_bits.h" |
34 | #include "ffmpeg_intreadwrite.h" | ||
34 | 35 | ||
35 | #define av_log(...) | 36 | #define av_log(...) |
36 | 37 | ||
@@ -65,6 +66,7 @@ void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) | |||
65 | if(terminate_string) | 66 | if(terminate_string) |
66 | put_bits(pb, 8, 0); | 67 | put_bits(pb, 8, 0); |
67 | } | 68 | } |
69 | #endif | ||
68 | 70 | ||
69 | void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) | 71 | void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) |
70 | { | 72 | { |
@@ -74,7 +76,7 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) | |||
74 | 76 | ||
75 | if(length==0) return; | 77 | if(length==0) return; |
76 | 78 | ||
77 | if(CONFIG_SMALL || words < 16 || put_bits_count(pb)&7){ | 79 | if(words < 16 || put_bits_count(pb)&7){ |
78 | for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(src + 2*i)); | 80 | for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(src + 2*i)); |
79 | }else{ | 81 | }else{ |
80 | for(i=0; put_bits_count(pb)&31; i++) | 82 | 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) | |||
86 | 88 | ||
87 | put_bits(pb, bits, AV_RB16(src + 2*words)>>(16-bits)); | 89 | put_bits(pb, bits, AV_RB16(src + 2*words)>>(16-bits)); |
88 | } | 90 | } |
89 | #endif | 91 | |
90 | /* VLC decoding */ | 92 | /* VLC decoding */ |
91 | 93 | ||
92 | //#define DEBUG_VLC | 94 | //#define DEBUG_VLC |