Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 19:17:53 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 19:21:21 +0000 (21:21 +0200)
commit876a663c668165e13feb7bad829d6ac034a6d416
treeb5b26b8fc6066a552544efee549172d9098081f9
parentd61386a69002be2cff212b03b51411dd294a7a22
parent254eb5b6faebb7bcfc3cefc1edced6652fe9d5be
Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'

* commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375deeaf22f8e8eaa4fcbc33115d104f7138
Merged-by: Michael Niedermayer <michaelni@gmx.at>