mirror of
https://github.com/mpv-player/mpv
synced 2025-03-23 20:00:56 +00:00
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28364 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
cdcd4e75b7
commit
4a0bcc1319
@ -56,10 +56,15 @@ Known Issues:
|
|||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "cpudetect.h"
|
#include "cpudetect.h"
|
||||||
|
|
||||||
|
#include "libavutil/internal.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavcodec/avcodec.h"
|
#include "libavcodec/avcodec.h"
|
||||||
#include "libavcodec/dsputil.h"
|
#include "libavcodec/dsputil.h"
|
||||||
|
|
||||||
|
#undef fprintf
|
||||||
|
#undef free
|
||||||
|
#undef malloc
|
||||||
|
|
||||||
#ifdef HAVE_MALLOC_H
|
#ifdef HAVE_MALLOC_H
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -37,10 +37,15 @@
|
|||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "cpudetect.h"
|
#include "cpudetect.h"
|
||||||
|
|
||||||
|
#include "libavutil/internal.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavcodec/avcodec.h"
|
#include "libavcodec/avcodec.h"
|
||||||
#include "libavcodec/dsputil.h"
|
#include "libavcodec/dsputil.h"
|
||||||
|
|
||||||
|
#undef fprintf
|
||||||
|
#undef free
|
||||||
|
#undef malloc
|
||||||
|
|
||||||
#ifdef HAVE_MALLOC_H
|
#ifdef HAVE_MALLOC_H
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user