Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 13:38:05 +0000 (14:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 13:38:10 +0000 (14:38 +0100)
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
  arm: Use full filenames as multiple inclusion guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dsputil_arm.h
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/mpegvideo_arm.h

Simple merge
Simple merge
Simple merge