Commit 7e8fdf05 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '593d2326'

* commit '593d2326':
  dv: Replace a magic number by sizeof()

Conflicts:
	libavcodec/dv.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 11ba0c82 593d2326
......@@ -314,7 +314,7 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx)
s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2];
}
}else
memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, 64);
memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, sizeof(s->dv_zigzag[1]));
s->avctx = avctx;
avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT;
......
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