Merge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:04:46 +0000 (22:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:04:58 +0000 (22:04 +0200)
commit80a76905eb5c72f99cf046ae233fb7cfe7f86030
treee7d26a2dc028c366c839a0950e1008d72b2a0b2e
parentabae926ef80c8553c732b95649d334b7a91374d3
parent65afa65e7393e7745427e267d6c6ca814c7c8b45
Merge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'

* commit '65afa65e7393e7745427e267d6c6ca814c7c8b45':
  h264: drop redundant initialization of the scaling matrices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c