Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:46:28 +0000 (14:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:57:31 +0000 (14:57 +0100)
* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
  bit_depth_template: Use file name as multiple inclusion guard

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

Simple merge