From 93d598c7b2d6f71fa6381829dc6ec3610ed322e8 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 16 Jan 2009 09:21:21 +0000 Subject: Lots and lots of #ifdef ARCH_... -> #if ARCH_... and #ifdef HAVE_MMX etc -> #if HAVE_MMX. There might be still more that need to be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/asfguid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/asfguid.h b/libmpdemux/asfguid.h index e9b8b08567..f5a9989e9f 100644 --- a/libmpdemux/asfguid.h +++ b/libmpdemux/asfguid.h @@ -26,7 +26,7 @@ #include "mpbswap.h" -#ifdef ARCH_X86 +#if ARCH_X86 #define ASF_LOAD_GUID_PREFIX(guid) (*(uint32_t *)(guid)) #else #define ASF_LOAD_GUID_PREFIX(guid) AV_RL32(guid) -- cgit v1.2.3 From 83c523f9ea76c556c1a8ee878ee91f15fe7ec1c6 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 17 Jan 2009 11:29:36 +0000 Subject: Fix compilation: s/ff_gcd/av_gcd. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index c1b302381f..9749054a03 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -263,7 +263,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8; sh_audio->audio.dwRate = codec->bit_rate; } - g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); + g= av_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); sh_audio->audio.dwScale /= g; sh_audio->audio.dwRate /= g; // printf("sca:%d rat:%d fs:%d sr:%d ba:%d\n", sh_audio->audio.dwScale, sh_audio->audio.dwRate, codec->frame_size, codec->sample_rate, codec->block_align); -- cgit v1.2.3