summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-25 10:49:43 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-25 10:49:43 +0000
commitfa7d28e85442394a296007b730105c5c0842cde4 (patch)
tree98b349c031e15c0174f87aa2ee972fdba0288e84 /libmpdemux
parentaca8a023cfbd58aa1554da897ccda877afdb1bc3 (diff)
downloadmpv-fa7d28e85442394a296007b730105c5c0842cde4.tar.bz2
mpv-fa7d28e85442394a296007b730105c5c0842cde4.tar.xz
Remove ff_gcd prototype and include avutil.h instead where it is defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22013 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 7e72adc549..6b7afec435 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -32,9 +32,11 @@
#ifdef USE_LIBAVFORMAT_SO
#include <ffmpeg/avformat.h>
+#include <ffmpeg/avutil.h>
#include <ffmpeg/opt.h>
#else
#include "avformat.h"
+#include "avutil.h"
#include "avi.h"
#include "opt.h"
#endif
@@ -65,8 +67,6 @@ typedef struct lavf_priv_t{
extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-int64_t ff_gcd(int64_t a, int64_t b);
-
static const AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')},
{ CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')},