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)
commit8b30702c44040c13abe759fa48673af7af417de9
treef3d58ef363dc00431305f6aa63a6febf4a049d23
parented72dae4cf80a3087f6ca050bc34facd1be3f98f
parent6a13505c069890cb0e2a07e29fd819a0cf2e73c1
Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'

* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning

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