[FFmpeg-cvslog] wmv2: Propagate the wmv2 idct permutation type to the dsputils context

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan 23 23:14:27 2013 +0200| [57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c
---

 libavcodec/wmv2.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index dea3b3b..4420f49 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],