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)
commita0cfec2e2bbb59984787eee25fcc62559db6d8d9
tree6b13afc8ff6d239e2d302cd701f9f10e894e7305
parente948f17369d446f7ab26bcf969a31872fc66fbdd
parentba42c852477e87f6e47a5587e8f7829c46c52032
Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'

* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
  bit_depth_template: Use file name as multiple inclusion guard

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