summaryrefslogtreecommitdiff
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2010-07-05 01:43:47 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2010-07-05 01:43:47 +0000
commit324a94b0225f137d79da35cfbce9be8ee837bc6f (patch)
treeb393a013d15125834257c55cd08252920e4a7921 /libavcodec/dca.c
parent9f434b6584322f230eecc2f65318fe8b64970fde (diff)
DCA: *_bits() -> *_bits_long() where needed, half fix for broken bitstream parsing
Originally committed as revision 24051 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r--libavcodec/dca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 0d4fa5aee6..989c6a286e 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1290,10 +1290,10 @@ static int dca_decode_frame(AVCodecContext * avctx,
num_core_channels = s->prim_channels;
/* extensions start at 32-bit boundaries into bitstream */
- skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);
+ skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
while(get_bits_left(&s->gb) >= 32) {
- uint32_t bits = get_bits(&s->gb, 32);
+ uint32_t bits = get_bits_long(&s->gb, 32);
switch(bits) {
case 0x5a5a5a5a: {
@@ -1328,7 +1328,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
break;
}
- skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);
+ skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
}
channels = s->prim_channels + !!s->lfe;