diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 03:15:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 03:16:53 +0200 |
| commit | 7e8fdf05e09a749ac74cf4b26797e44305a2b068 (patch) | |
| tree | 8f0b331dad92f8e8017932bbaf4e5c0d324721fb | |
| parent | 11ba0c82076dd4b22b5d28ff8004308f6ee99b4e (diff) | |
| parent | 593d2326ef985cdffe413df629419938f7b07c4c (diff) | |
| download | ffmpeg-7e8fdf05e09a749ac74cf4b26797e44305a2b068.tar.gz | |
Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'
* commit '593d2326ef985cdffe413df629419938f7b07c4c':
dv: Replace a magic number by sizeof()
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 554ec452d6..c3c32864c5 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -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; |