summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-01-23 23:14:27 +0200
committerMartin Storsjö <martin@martin.st>2013-01-24 00:32:35 +0200
commit57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c (patch)
tree582143dc0acf762978a6c02095b9f0ca04853988 /libavcodec/wmv2.c
parente90820d4f815c15796e642467cdddbad755212a2 (diff)
wmv2: Propagate the wmv2 idct permutation type to the dsputils context
This fixes encoding where the idct setting originally was set to FF_IDCT_AUTO and dsputil chose a default idct with a non-null permutation - even if the permutation tables were updated, dct_quantize in x86/mpegvideoenc_template.c also checked the value of this type variable. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/wmv2.c')
-rw-r--r--libavcodec/wmv2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index dea3b3b67d..4420f494a6 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -29,6 +29,7 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){
MpegEncContext * const s= &w->s;
ff_wmv2dsp_init(&w->wdsp);
+ s->dsp.idct_permutation_type = w->wdsp.idct_perm;
ff_init_scantable_permutation(s->dsp.idct_permutation,
w->wdsp.idct_perm);
ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0],