pp_sharp_modr18268 | tterribe | 2012-05-08 03:51:57 +0100 (Tue, 08 May 2012) | 8 lines

Fix pp_sharp_mod calculation.

This was broken when the dequant_tables indexing changed in commit

 r16102, but it only affected post-processing quality, so we never

 noticed.

With gcc 4.8.0, this can now trigger a segfault during decoder

 initialization.

--- a/lib/decode.c	(revision 18267)

+++ b/lib/decode.c	(revision 18268)

@@ -400,10 +400,10 @@

     int qsum;

     qsum=0;

     for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){

-      qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+

-       _dec->state.dequant_tables[qti][pli][qi][17]+

-       _dec->state.dequant_tables[qti][pli][qi][18]+

-       _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);

+      qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+

+       _dec->state.dequant_tables[qi][pli][qti][17]+

+       _dec->state.dequant_tables[qi][pli][qti][18]+

+       _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);

     }

     _dec->pp_sharp_mod[qi]=-(qsum>>11);

   }