Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 21995:f615c862f862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove ff_gcd prototype and include avutil.h instead where it is defined.
author reimar
date Thu, 25 Jan 2007 10:49:43 +0000
parents d9494ca70ca7
children b149aa896f8d
comparison
equal deleted inserted replaced
21994:e1c2963553f3 21995:f615c862f862
30 #include "stheader.h" 30 #include "stheader.h"
31 #include "m_option.h" 31 #include "m_option.h"
32 32
33 #ifdef USE_LIBAVFORMAT_SO 33 #ifdef USE_LIBAVFORMAT_SO
34 #include <ffmpeg/avformat.h> 34 #include <ffmpeg/avformat.h>
35 #include <ffmpeg/avutil.h>
35 #include <ffmpeg/opt.h> 36 #include <ffmpeg/opt.h>
36 #else 37 #else
37 #include "avformat.h" 38 #include "avformat.h"
39 #include "avutil.h"
38 #include "avi.h" 40 #include "avi.h"
39 #include "opt.h" 41 #include "opt.h"
40 #endif 42 #endif
41 #include "riff.h" 43 #include "riff.h"
42 44
62 int vstreams[MAX_V_STREAMS]; 64 int vstreams[MAX_V_STREAMS];
63 }lavf_priv_t; 65 }lavf_priv_t;
64 66
65 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); 67 extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
66 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); 68 extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
67
68 int64_t ff_gcd(int64_t a, int64_t b);
69 69
70 static const AVCodecTag mp_wav_tags[] = { 70 static const AVCodecTag mp_wav_tags[] = {
71 { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, 71 { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')},
72 { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, 72 { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')},
73 { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, 73 { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')},