RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032' 

* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
  bit_depth_template: Use file name as multiple inclusion guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-20 14:46:28 +01:00
parent e948f17369 ba42c85247
commit a0cfec2e2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/bit_depth_template.c
View File

@ -23,7 +23,7 @@
#define BIT_DEPTH 8 #define BIT_DEPTH 8
#endif #endif
#ifdef AVCODEC_H264_HIGH_DEPTH_H #ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C
# undef pixel # undef pixel
# undef pixel2 # undef pixel2
# undef pixel4 # undef pixel4
@ -43,7 +43,7 @@
# undef av_clip_pixel # undef av_clip_pixel
# undef PIXEL_SPLAT_X4 # undef PIXEL_SPLAT_X4
#else #else
# define AVCODEC_H264_HIGH_DEPTH_H # define AVCODEC_BIT_DEPTH_TEMPLATE_C
#endif #endif
#if BIT_DEPTH > 8 #if BIT_DEPTH > 8