diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 23:42:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 23:42:19 +0200 |
| commit | c6963a220d5849fd5399c056b21ec66de7a0df37 (patch) | |
| tree | 142ce617e997fd542f0f2ccd460212b5a3dc6835 /libavcodec/tscc2.c | |
| parent | 94c3e11a6f62bf13a7e6f1b9287c6112bf6ee445 (diff) | |
| parent | 5361e10a5e8740146c09a115477310c77b927215 (diff) | |
| download | ffmpeg-c6963a220d5849fd5399c056b21ec66de7a0df37.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: port x86 assembly to cpuflags.
lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro
lavfi: better channel layout negotiation
alac: check for truncated packets
alac: reverse lpc coeff order, simplify filter
lavr: add x86-optimized mixing functions
x86: add support for fmaddps fma4 instruction with abstraction to avx/sse
tscc2: fix typo in array index
build: use COMPILE template for HOSTOBJS
build: do full flag handling for all compiler-type tools
eval: fix printing of NaN in eval fate test.
build: Rename aandct component to more descriptive aandcttables
mpegaudio: bury inline asm under HAVE_INLINE_ASM.
x86inc: automatically insert vzeroupper for YMM functions.
rtmp: Check the buffer length of ping packets
rtmp: Allow having more unknown data at the end of a chunk size packet without failing
rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets
Conflicts:
Makefile
configure
libavcodec/x86/proresdsp.asm
libavutil/eval.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tscc2.c')
| -rw-r--r-- | libavcodec/tscc2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index a8fd652e59..5e2fd02745 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -298,8 +298,8 @@ static int tscc2_decode_frame(AVCodecContext *avctx, void *data, if (!size) { int skip_row = 1, j, off = i * c->mb_width; for (j = 0; j < c->mb_width; j++) { - if (c->slice_quants[off + i] == 1 || - c->slice_quants[off + i] == 2) { + if (c->slice_quants[off + j] == 1 || + c->slice_quants[off + j] == 2) { skip_row = 0; break; } |