summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/asfguid.h2
-rw-r--r--libmpdemux/demux_lavf.c2
2 files changed, 2 insertions, 2 deletions
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)
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 1179369847..047315e74c 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -261,7 +261,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);