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/dvenc.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/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 3efe53a838..052b631863 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -249,7 +249,7 @@ static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, i } bi->mb[0] = blk[0]; - zigzag_scan = bi->dct_mode ? ff_zigzag248_direct : ff_zigzag_direct; + zigzag_scan = bi->dct_mode ? ff_dv_zigzag248_direct : ff_zigzag_direct; weight = bi->dct_mode ? dv_weight_248 : dv_weight_88; for (area = 0; area < 4; area++) { |