diff options
| author | bircoph <bircoph@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-28 20:01:43 +0000 |
|---|---|---|
| committer | bircoph <bircoph@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-28 20:01:43 +0000 |
| commit | e3455c5b20617f339bd27a65b2d1182bd36f9310 (patch) | |
| tree | 4f59e5ff9b2491eff2ffe22713a32646443ff193 | |
| parent | 42a792bbc71e1cb4b15765af8acda48a9951a210 (diff) | |
| download | mpv-e3455c5b20617f339bd27a65b2d1182bd36f9310.tar.bz2 mpv-e3455c5b20617f339bd27a65b2d1182bd36f9310.tar.xz | |
Remove af_mp.h and add its content to af.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29089 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libaf/af.h | 9 | ||||
| -rw-r--r-- | libaf/af_mp.h | 33 |
2 files changed, 8 insertions, 34 deletions
diff --git a/libaf/af.h b/libaf/af.h index 13f3f6cf76..0a3c6b8030 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -22,10 +22,17 @@ #include <stdio.h> #include "config.h" -#include "af_mp.h" #include "control.h" #include "af_format.h" #include "mp_msg.h" +#include "cpudetect.h" + +/* Set the initialization type from mplayers cpudetect */ +#ifdef AF_INIT_TYPE +#undef AF_INIT_TYPE +#define AF_INIT_TYPE \ + ((gCpuCaps.has3DNow || gCpuCaps.hasSSE)?AF_INIT_FAST:AF_INIT_SLOW) +#endif struct af_instance_s; diff --git a/libaf/af_mp.h b/libaf/af_mp.h deleted file mode 100644 index fd4a383720..0000000000 --- a/libaf/af_mp.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* Include file for mplayer specific defines and includes */ -#ifndef MPLAYER_AF_MP_H -#define MPLAYER_AF_MP_H - -#include "config.h" -#include "cpudetect.h" - -/* Set the initialization type from mplayers cpudetect */ -#ifdef AF_INIT_TYPE -#undef AF_INIT_TYPE -#define AF_INIT_TYPE \ - ((gCpuCaps.has3DNow || gCpuCaps.hasSSE)?AF_INIT_FAST:AF_INIT_SLOW) -#endif - -#endif /* MPLAYER_AF_MP_H */ |