Merge commit 'a88e1d1c598e641eecd5d43730211d91c82787c6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 22:55:00 +0000 (00:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 22:55:40 +0000 (00:55 +0200)
* commit 'a88e1d1c598e641eecd5d43730211d91c82787c6':
  lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsets

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

Simple merge
Simple merge
Simple merge