media/libtheora/bug752668-r18268.patch@b8a032363ba2 (annotated)
media/libtheora/bug752668-r18268.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | diff -r 1092c1a3ac50 media/libtheora/lib/decode.c |
| michael@0 | 2 | --- a/media/libtheora/lib/decode.c Tue May 08 08:53:50 2012 +0200 |
| michael@0 | 3 | +++ b/media/libtheora/lib/decode.c Tue May 08 01:00:59 2012 -0700 |
| michael@0 | 4 | @@ -395,20 +395,20 @@ static int oc_dec_init(oc_dec_ctx *_dec, |
| michael@0 | 5 | _dec->state.dequant_table_data[qi][pli][qti]; |
| michael@0 | 6 | } |
| michael@0 | 7 | oc_dequant_tables_init(_dec->state.dequant_tables,_dec->pp_dc_scale, |
| michael@0 | 8 | &_setup->qinfo); |
| michael@0 | 9 | for(qi=0;qi<64;qi++){ |
| michael@0 | 10 | int qsum; |
| michael@0 | 11 | qsum=0; |
| michael@0 | 12 | for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){ |
| michael@0 | 13 | - qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+ |
| michael@0 | 14 | - _dec->state.dequant_tables[qti][pli][qi][17]+ |
| michael@0 | 15 | - _dec->state.dequant_tables[qti][pli][qi][18]+ |
| michael@0 | 16 | - _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0); |
| michael@0 | 17 | + qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+ |
| michael@0 | 18 | + _dec->state.dequant_tables[qi][pli][qti][17]+ |
| michael@0 | 19 | + _dec->state.dequant_tables[qi][pli][qti][18]+ |
| michael@0 | 20 | + _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0); |
| michael@0 | 21 | } |
| michael@0 | 22 | _dec->pp_sharp_mod[qi]=-(qsum>>11); |
| michael@0 | 23 | } |
| michael@0 | 24 | memcpy(_dec->state.loop_filter_limits,_setup->qinfo.loop_filter_limits, |
| michael@0 | 25 | sizeof(_dec->state.loop_filter_limits)); |
| michael@0 | 26 | oc_dec_accel_init(_dec); |
| michael@0 | 27 | _dec->pp_level=OC_PP_LEVEL_DISABLED; |
| michael@0 | 28 | _dec->dc_qis=NULL; |
