diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:25:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:25:19 +0100 |
| commit | 1146bbc5a630db5169e51a9185292f88b1de6933 (patch) | |
| tree | 0fb2b2e736b36a2dac5e06d0b85ebdaf802c59dd | |
| parent | bb2f4ae434223e99f131100f4bc71762b79eb6c5 (diff) | |
| parent | 834e9fb0563956630e4d9bf61c9242ad134334da (diff) | |
| download | ffmpeg-1146bbc5a630db5169e51a9185292f88b1de6933.tar.gz | |
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>
| -rw-r--r-- | libavcodec/shorten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 8e66928db5..804dac7558 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -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) { |