[FFmpeg-cvslog] bit_depth_template: Use file name as multiple inclusion guard

Diego Biurrun git at videolan.org
Mon Mar 3 23:14:24 CET 2014


ffmpeg | branch: release/2.2 | Diego Biurrun <diego at biurrun.de> | Sun Dec 22 14:19:28 2013 +0100| [4015829accc2382393d42d62654eb96d896d1326] | committer: Reinhard Tartler

bit_depth_template: Use file name as multiple inclusion guard

(cherry picked from commit ba42c852477e87f6e47a5587e8f7829c46c52032)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4015829accc2382393d42d62654eb96d896d1326
---

 libavcodec/bit_depth_template.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 37d02ad..8fc826b 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



More information about the ffmpeg-cvslog mailing list