Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:22:53 +0000 (00:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:23:01 +0000 (00:23 +0200)
* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/asm-offsets.h
libavcodec/mpegvideo.h

Simple merge
Simple merge