diff options
| author | Peter Ross <pross@xvid.org> | 2022-10-26 20:11:21 +1100 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2022-10-26 20:30:25 +1100 |
| commit | 58bd7d97a47da1065e2616d396938609b50ad1e4 (patch) | |
| tree | 47b73bf18a25c15ed84eeb667f31fffa63a12497 /libavcodec/vp3.c | |
| parent | 9bed814e1d44e8374e9a4901e3f9b00ded0716fb (diff) | |
| download | ffmpeg-58bd7d97a47da1065e2616d396938609b50ad1e4.tar.gz | |
avcodec/jpegtables: remove duplicate luma and chroma quantization tables
Duplicates of the standard JPEG quantization tables were found in the
AGM, MSS34(dsp), NUV and VP31 codecs. This patch elimates those duplicates,
placing a single copy in jpegquanttables.c.
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 31775455a4..b731bc0669 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -43,6 +43,7 @@ #include "decode.h" #include "get_bits.h" #include "hpeldsp.h" +#include "jpegquanttables.h" #include "mathops.h" #include "thread.h" #include "threadframe.h" @@ -2418,7 +2419,7 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->coded_dc_scale_factor[1][i] = s->version < 2 ? vp31_dc_scale_factor[i] : vp4_uv_dc_scale_factor[i]; s->coded_ac_scale_factor[i] = s->version < 2 ? vp31_ac_scale_factor[i] : vp4_ac_scale_factor[i]; s->base_matrix[0][i] = s->version < 2 ? vp31_intra_y_dequant[i] : vp4_generic_dequant[i]; - s->base_matrix[1][i] = s->version < 2 ? vp31_intra_c_dequant[i] : vp4_generic_dequant[i]; + s->base_matrix[1][i] = s->version < 2 ? ff_mjpeg_std_chrominance_quant_tbl[i] : vp4_generic_dequant[i]; s->base_matrix[2][i] = s->version < 2 ? vp31_inter_dequant[i] : vp4_generic_dequant[i]; s->filter_limit_values[i] = s->version < 2 ? vp31_filter_limit_values[i] : vp4_filter_limit_values[i]; } |