Commit 1146bbc5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Fix a typo, use the right register
  shorten: fix array subscript is below array bounds warning

Conflicts:
	libavcodec/shorten.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bb2f4ae4 834e9fb0
...@@ -467,7 +467,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, ...@@ -467,7 +467,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
s->cur_chan = 0; s->cur_chan = 0;
while (s->cur_chan < s->channels) { while (s->cur_chan < s->channels) {
unsigned int cmd; unsigned cmd;
int len; int len;
if (get_bits_left(&s->gb) < 3+FNSIZE) { if (get_bits_left(&s->gb) < 3+FNSIZE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment