mirror of https://github.com/mpv-player/mpv
include get_path.c before avcodec.h, fix error on osx + gcc4 where defined macro always_inline in libavcodec/common.h already exist in math.h and used for something else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15508 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ca861c5635
commit
5b963b3ce0
|
@ -72,6 +72,8 @@
|
|||
|
||||
#include "osdep/timer.h"
|
||||
|
||||
#include "get_path.c"
|
||||
|
||||
#ifdef USE_LIBAVCODEC
|
||||
#ifdef USE_LIBAVCODEC_SO
|
||||
#include <ffmpeg/avcodec.h>
|
||||
|
@ -230,8 +232,6 @@ static void parse_end_at();
|
|||
static char * end_at_string=0;
|
||||
//static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
|
||||
|
||||
#include "get_path.c"
|
||||
|
||||
#ifdef USE_EDL
|
||||
#include "edl.h"
|
||||
static edl_record_ptr edl_records = NULL; ///< EDL entries memory area
|
||||
|
|
Loading…
Reference in New Issue