Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:40:00 +0000 (21:40 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:40:05 +0000 (21:40 +0100)
commit741960e2f330c369933151064d6c546cbdc706d3
tree0707f63e7891faa237870ec890085acd3f35d79d
parentf110c624b1f30ac7f817eda128db1265260e57c7
parent9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c
Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/intrax8.c