[FFmpeg-cvslog] Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sat May  7 21:40:00 2016 +0100| [741960e2f330c369933151064d6c546cbdc706d3] | committer: Derek Buitenhuis

Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

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

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

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

 libavcodec/intrax8.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index c953804..19cb301 100644
--- a/libavcodec/intrax8.c
+++ b/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++;
             }


======================================================================