From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 20 Feb 2014 13:46:28 +0000 (+0100)
Subject: Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
X-Git-Tag: n2.2-rc1~160
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/a0cfec2e2bbb59984787eee25fcc62559db6d8d9

Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

a0cfec2e2bbb59984787eee25fcc62559db6d8d9