RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-28 14:25:19 +01:00
parent bb2f4ae434 834e9fb056
commit 1146bbc5a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/shorten.c
View File

@ -467,7 +467,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
s->cur_chan = 0;
while (s->cur_chan < s->channels) {
unsigned int cmd;
unsigned cmd;
int len;
if (get_bits_left(&s->gb) < 3+FNSIZE) {