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)
* commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62':
  vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock

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

Simple merge