[SCM] libav/experimental: bit_depth_template: Use file name as multiple inclusion guard
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:01:26 UTC 2014
The following commit has been merged in the experimental branch:
commit ba42c852477e87f6e47a5587e8f7829c46c52032
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Dec 22 14:19:28 2013 +0100
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 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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list