Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'

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

Michael Niedermayer committed 12 years ago

Commit a0cfec22 parents e948f17 ba42c851 file · +2 −2Browse files

Unified · Split

@@ -23,7 +23,7 @@ · 22 unmodified lines
23	23	#define BIT_DEPTH 8
24	24	#endif
25	25
26		−#ifdef AVCODEC_H264_HIGH_DEPTH_H
	26	+#ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C
27	27	# undef pixel
28	28	# undef pixel2
29	29	# undef pixel4
@@ -43,7 +43,7 @@ · 13 unmodified lines
43	43	# undef av_clip_pixel
44	44	# undef PIXEL_SPLAT_X4
45	45	#else
46		−# define AVCODEC_H264_HIGH_DEPTH_H
	46	+# define AVCODEC_BIT_DEPTH_TEMPLATE_C
47	47	#endif
48	48
49	49	#if BIT_DEPTH > 8

Keyboard shortcuts