Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 21822:fc4ce8a91a2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include "internal" libavformat/riff.h also when dynamic libavformat is used instead of duplicating typedefs and function prototypes in already three different places.
author reimar
date Sat, 06 Jan 2007 17:28:11 +0000
parents 2158c95b71f6
children 1e0bbd27136d
comparison
equal deleted inserted replaced
21821:2a0a1f974172 21822:fc4ce8a91a2e
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/opt.h> 35 #include <ffmpeg/opt.h>
36 typedef struct CodecTag {
37 int id;
38 unsigned int tag;
39 unsigned int invalid_asf : 1;
40 } CodecTag;
41 #else 36 #else
42 #include "avformat.h" 37 #include "avformat.h"
43 #include "riff.h"
44 #include "avi.h" 38 #include "avi.h"
45 #include "opt.h" 39 #include "opt.h"
46 #endif 40 #endif
41 #include "riff.h"
47 42
48 #define PROBE_BUF_SIZE 2048 43 #define PROBE_BUF_SIZE 2048
49 44
50 extern char *audio_lang; 45 extern char *audio_lang;
51 static unsigned int opt_probesize = 0; 46 static unsigned int opt_probesize = 0;