diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:46:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:57:31 +0100 |
| commit | a0cfec2e2bbb59984787eee25fcc62559db6d8d9 (patch) | |
| tree | 6b13afc8ff6d239e2d302cd701f9f10e894e7305 | |
| parent | e948f17369d446f7ab26bcf969a31872fc66fbdd (diff) | |
| parent | ba42c852477e87f6e47a5587e8f7829c46c52032 (diff) | |
| download | ffmpeg-a0cfec2e2bbb59984787eee25fcc62559db6d8d9.tar.gz | |
Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
bit_depth_template: Use file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/bit_depth_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c index 96f5edec0f..56c2935a24 100644 --- 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 |