diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:57:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 14:58:04 +0100 |
| commit | 8372aaf7210e0833b17982a3ced304c47e8f668b (patch) | |
| tree | 6d2fd66b45300a4c72cb46878dec0fc37153cebc | |
| parent | a0cfec2e2bbb59984787eee25fcc62559db6d8d9 (diff) | |
| parent | 017a06a9ee86b047079166c2694c9c655ff03356 (diff) | |
| download | ffmpeg-8372aaf7210e0833b17982a3ced304c47e8f668b.tar.gz | |
Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'
* commit '017a06a9ee86b047079166c2694c9c655ff03356':
x86: dsputil: Use correct file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dsputil_x86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index 356b2c142f..4f7ac90eb9 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_X86_DSPUTIL_MMX_H -#define AVCODEC_X86_DSPUTIL_MMX_H +#ifndef AVCODEC_X86_DSPUTIL_X86_H +#define AVCODEC_X86_DSPUTIL_X86_H #include <stddef.h> #include <stdint.h> @@ -195,4 +195,4 @@ STATIC void PFX1 ## _pixels16 ## TYPE ## CPUEXT(uint8_t *block, \ line_size, h); \ } -#endif /* AVCODEC_X86_DSPUTIL_MMX_H */ +#endif /* AVCODEC_X86_DSPUTIL_X86_H */ |