diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 20:43:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 20:57:39 +0200 |
| commit | 9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5 (patch) | |
| tree | df92b2b44496b4268d52c306974b92009b6f764e /libavcodec/vqavideo.c | |
| parent | de1824e970d448a84bedce4936c301c322baa714 (diff) | |
| parent | ec2dbec84d94129207ed0f2a1151679fab305060 (diff) | |
| download | ffmpeg-9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: employ better names and add a convenient shorthand for vp6 tests
arm/neon: dsputil: use correct size specifiers on vld1/vst1
arm: dsputil: prettify some conditional instructions in put_pixels macros
vqavideo: change x/y loop counters to the usual pattern
avconv: use lrint() for rounding double timestamps
Conflicts:
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
| -rw-r--r-- | libavcodec/vqavideo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 6874b75201..a93f4322ab 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -473,11 +473,9 @@ static int vqa_decode_chunk(VqaContext *s) index_shift = 4; else index_shift = 3; - for (y = 0; y < s->frame.linesize[0] * s->height; - y += s->frame.linesize[0] * s->vector_height) { - - for (x = y; x < y + s->width; x += 4, lobytes++, hibytes++) { - pixel_ptr = x; + for (y = 0; y < s->height; y += s->vector_height) { + for (x = 0; x < s->width; x += 4, lobytes++, hibytes++) { + pixel_ptr = y * s->frame.linesize[0] + x; /* get the vector index, the method for which varies according to * VQA file version */ |