History

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

Showing the changes to libavcodec/bit_depth_template.c (1 of 1 file). Show all

Unified · Split

libavcodec/bit_depth_template.c+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #define BIT_DEPTH 8
2424 #endif
2525
26−#ifdef AVCODEC_H264_HIGH_DEPTH_H
26+#ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C
2727 # undef pixel
2828 # undef pixel2
2929 # undef pixel4
@@ -43,7 +43,7 @@ · 13 unmodified lines
4343 # undef av_clip_pixel
4444 # undef PIXEL_SPLAT_X4
4545 #else
46−# define AVCODEC_H264_HIGH_DEPTH_H
46+# define AVCODEC_BIT_DEPTH_TEMPLATE_C
4747 #endif
4848
4949 #if BIT_DEPTH > 8

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t