Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
  intrax8: Drop MB emulation code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavcodec/intrax8.c

@@ -828,9 +828,6 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
                 w->dest[1] += 8;
                 w->dest[2] += 8;
 
-                /* emulate MB info in the relevant tables */
-                s->mbskip_table[mb_xy]                 = 0;
-                s->mbintra_table[mb_xy]                = 1;
                 pict->qscale_table[mb_xy] = w->quant;
                 mb_xy++;
             }