Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'

* commit '017a06a9ee86b047079166c2694c9c655ff03356':
  x86: dsputil: Use correct file name as multiple inclusion guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-20 14:57:58 +01:00
commit 8372aaf721
1 changed files with 3 additions and 3 deletions

View File

@ -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 */