From: Diego Biurrun Date: Sun, 22 Dec 2013 13:19:28 +0000 (+0100) Subject: bit_depth_template: Use file name as multiple inclusion guard X-Git-Tag: android-x86-6.0-r1~10^2~2140 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba42c852477e87f6e47a5587e8f7829c46c52032;p=android-x86%2Fexternal-ffmpeg.git bit_depth_template: Use file name as multiple inclusion guard --- diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c index 37d02adaf2..8fc826b7d2 100644 --- a/libavcodec/bit_depth_template.c +++ b/libavcodec/bit_depth_template.c @@ -22,7 +22,7 @@ #define BIT_DEPTH 8 #endif -#ifdef AVCODEC_H264_HIGH_DEPTH_H +#ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C # undef pixel # undef pixel2 # undef pixel4 @@ -42,7 +42,7 @@ # undef av_clip_pixel # undef PIXEL_SPLAT_X4 #else -# define AVCODEC_H264_HIGH_DEPTH_H +# define AVCODEC_BIT_DEPTH_TEMPLATE_C #endif #if BIT_DEPTH > 8