diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
| commit | 15141f939dc725451644869f4d413adb46927677 (patch) | |
| tree | e0aba01c6ebbe093e4b3265ae94f639628c1053f /libavcodec/dvdec.c | |
| parent | 68ca49dc7256bbe413ce29fa3fc47bb4143304c0 (diff) | |
| parent | 8b84e082ed27fb635fca524fbd14b1db094ee8b0 (diff) | |
| download | ffmpeg-15141f939dc725451644869f4d413adb46927677.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index c9a5f2e903..4e09d0dd9a 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; @@ -54,6 +53,8 @@ typedef struct BlockInfo { int shift_offset; } BlockInfo; +static const int dv_iweight_bits = 14; + /* decode AC coefficients */ static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block) { @@ -181,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 |