projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: e948f17)
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>
libavcodec/bit_depth_template.c patch | blob | history

diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 96f5ede..56c2935 100644 (file)
--- a/libavcodec/bit_depth_template.c
+++ b/libavcodec/bit_depth_template.c
@@ -23,7 +23,7 @@
 #define BIT_DEPTH 8
 #endif
 
-#ifdef AVCODEC_H264_HIGH_DEPTH_H
+#ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C
 #   undef pixel
 #   undef pixel2
 #   undef pixel4
@@ -43,7 +43,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
FFmpeg git repo