From 8dc253dad613fa9408f0a0ccb674e9e77ddef767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sat, 8 Apr 2006 16:42:23 +0000 Subject: Ancient platforms support: - rint, lrint, M_PI (ffmpeg and goom) - avoid mkdir warnings - check for older _GUID_DEFINED too - ressurected generating inttypes, cleaned public os_types.h - moved function redefiniton used only in the old MSVC to central place Windows port update: - build internal ffmpeg: - workaround 'near' keyword problem - proper using __declspec(dllimport) Other changes: - LIBFFMPEG_CFLAGS --> LIBFFMPEG_CPPFLAGS CVS patchset: 7964 CVS date: 2006/04/08 16:42:23 --- src/demuxers/asfheader.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/demuxers') diff --git a/src/demuxers/asfheader.h b/src/demuxers/asfheader.h index 0a73a2570..2f2fd6705 100644 --- a/src/demuxers/asfheader.h +++ b/src/demuxers/asfheader.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: asfheader.h,v 1.4 2005/01/12 00:05:36 tmattern Exp $ + * $Id: asfheader.h,v 1.5 2006/04/08 16:42:24 valtri Exp $ * * demultiplexer for asf streams * @@ -109,8 +109,9 @@ #define ASF_MAX_NUM_STREAMS 23 -#ifndef GUID_DEFINED +#if !defined(GUID_DEFINED) && !defined(_GUID_DEFINED) #define GUID_DEFINED +#define _GUID_DEFINED typedef struct _GUID { /* size is 16 */ uint32_t Data1; -- cgit v1.2.3