ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/cavs.c

 /*
  * Chinese AVS video (AVS1-P2, JiZhun profile) decoder.
  * Copyright (c) 2006  Stefan Gehrer <stefan.gehrer@gmx.de>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 55 matching lines @@
  * boundary strength (bs) mapping:
  *
  * --4---5--
  * 0   2   |
  * | 6 | 7 |
  * 1   3   |
  * ---------
  *
  */
 void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) {
-    DECLARE_ALIGNED_8(uint8_t, bs)[8];
+    uint8_t bs[8];
     int qp_avg, alpha, beta, tc;
     int i;
 
     /* save un-deblocked lines */
     h->topleft_border_y = h->top_border_y[h->mbx*16+15];
     h->topleft_border_u = h->top_border_u[h->mbx*10+8];
     h->topleft_border_v = h->top_border_v[h->mbx*10+8];
     memcpy(&h->top_border_y[h->mbx*16], h->cy + 15* h->l_stride,16);
     memcpy(&h->top_border_u[h->mbx*10+1], h->cu +  7* h->c_stride,8);
     memcpy(&h->top_border_v[h->mbx*10+1], h->cv +  7* h->c_stride,8);
     for(i=0;i<8;i++) {
         h->left_border_y[i*2+1] = *(h->cy + 15 + (i*2+0)*h->l_stride);
         h->left_border_y[i*2+2] = *(h->cy + 15 + (i*2+1)*h->l_stride);
         h->left_border_u[i+1] = *(h->cu + 7 + i*h->c_stride);
         h->left_border_v[i+1] = *(h->cv + 7 + i*h->c_stride);
     }
     if(!h->loop_filter_disable) {
         /* determine bs */
         if(mb_type == I_8X8)
-            *((uint64_t *)bs) = 0x0202020202020202ULL;
+            memset(bs,2,8);
         else{
-            *((uint64_t *)bs) = 0;
+            memset(bs,0,8);
             if(ff_cavs_partition_flags[mb_type] & SPLITV){
                 bs[2] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X1], mb_type > P_8X8);
                 bs[3] = get_bs(&h->mv[MV_FWD_X2], &h->mv[MV_FWD_X3], mb_type > P_8X8);
             }
             if(ff_cavs_partition_flags[mb_type] & SPLITH){
                 bs[6] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X2], mb_type > P_8X8);
                 bs[7] = get_bs(&h->mv[MV_FWD_X1], &h->mv[MV_FWD_X3], mb_type > P_8X8);
             }
             bs[0] = get_bs(&h->mv[MV_FWD_A1], &h->mv[MV_FWD_X0], mb_type > P_8X8);
             bs[1] = get_bs(&h->mv[MV_FWD_A3], &h->mv[MV_FWD_X2], mb_type > P_8X8);
             bs[4] = get_bs(&h->mv[MV_FWD_B2], &h->mv[MV_FWD_X0], mb_type > P_8X8);
             bs[5] = get_bs(&h->mv[MV_FWD_B3], &h->mv[MV_FWD_X1], mb_type > P_8X8);
         }
-        if( *((uint64_t *)bs) ) {
+        if(AV_RN64(bs)) {
             if(h->flags & A_AVAIL) {
                 qp_avg = (h->qp + h->left_qp + 1) >> 1;
                 SET_PARAMS;
                 h->s.dsp.cavs_filter_lv(h->cy,h->l_stride,alpha,beta,tc,bs[0],bs[1]);
                 h->s.dsp.cavs_filter_cv(h->cu,h->c_stride,alpha,beta,tc,bs[0],bs[1]);
                 h->s.dsp.cavs_filter_cv(h->cv,h->c_stride,alpha,beta,tc,bs[0],bs[1]);
             }
             qp_avg = h->qp;
             SET_PARAMS;
             h->s.dsp.cavs_filter_lv(h->cy + 8,h->l_stride,alpha,beta,tc,bs[2],bs[3]);
@@ skipping 583 matching lines @@
     av_free(h->top_mv[1]);
     av_free(h->top_pred_Y);
     av_free(h->top_border_y);
     av_free(h->top_border_u);
     av_free(h->top_border_v);
     av_free(h->col_mv);
     av_free(h->col_type_base);
     av_free(h->block);
     return 0;
 }