diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-04-04 17:32:55 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-04-16 10:04:57 +0200 |
| commit | a3dbd459ffe1eef2705090d33e3bdaac539bb62f (patch) | |
| tree | f077786f4cf4f2b0c988a8f569156fa65312dcf1 /libavcodec/dvdec.c | |
| parent | 05afc5f57d19ab403f4c798b5a479ae016a2307c (diff) | |
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 582574b14d..6b77a40568 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -42,7 +42,6 @@ #include "put_bits.h" #include "simple_idct.h" #include "dvdata.h" -#include "dvquant.h" typedef struct BlockInfo { const uint32_t *factor_table; @@ -183,7 +182,7 @@ static int dv_decode_video_segment(AVCodecContext *avctx, void *arg) mb->idct_put = s->idct_put[dct_mode && log2_blocksize == 3]; mb->scan_table = s->dv_zigzag[dct_mode]; mb->factor_table = &s->sys->idct_factor[(class1 == 3)*2*22*64 + dct_mode*22*64 + - (quant + dv_quant_offset[class1])*64]; + (quant + ff_dv_quant_offset[class1])*64]; } dc = dc << 2; /* convert to unsigned because 128 is not added in the |