Merge commit '65127450add50c3bca307edc0517d2e8382717a0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:16:16 +0000 (12:16 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:16:16 +0000 (12:16 +0100)
commit627115b3e43f21023ff04c51de1fdfcd7296bbb1
tree7d62829b2b917272165a0e05fcaf8d1b40a15b8c
parent1a9ffc59d27cae059026192496027794c9273ab0
parent65127450add50c3bca307edc0517d2e8382717a0
Merge commit '65127450add50c3bca307edc0517d2e8382717a0'

* commit '65127450add50c3bca307edc0517d2e8382717a0':
  intrax8: Make x8_init_block_index not use mpegvideo fields

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