Merge commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 23:22:52 +0000 (01:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2014 23:23:00 +0000 (01:23 +0200)
commit2adcd15f2e02e240b31353285f9336a4cbab8274
treefc3ad9723baf4576b42f570ff6401ed88c179d89
parent4959a4fcf76e7c595dbb23c4e3bf59abf2e60ea4
parenta6ac4fcce44108f6f87278b8d12e890576f46a62
Merge commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62'

* commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62':
  vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp8.h