diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
| commit | 47fc82b5b34677f49bb263ee9e67350cb004fe31 (patch) | |
| tree | 082f3f5e1a65159244427d1362f3caea9092af7c /libavcodec/dv.c | |
| parent | e6f69b324e88794c7a2874e5ee8398b3ac41b10c (diff) | |
| parent | 5f9220437025a0d66abc68323b4ce9b50e72d51b (diff) | |
| download | ffmpeg-47fc82b5b34677f49bb263ee9e67350cb004fe31.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.c')
| -rw-r--r-- | libavcodec/dv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index ea05e9dd88..a9f64b4a8d 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -314,11 +314,11 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx) s->idct_put[1] = ff_simple_idct248_put; // FIXME: need to add it to DSP if (avctx->lowres){ for (i = 0; i < 64; i++){ - int j = ff_zigzag248_direct[i]; + int j = ff_dv_zigzag248_direct[i]; s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2]; } }else - memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64); + memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, 64); s->avctx = avctx; avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; |