diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-06 17:28:11 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-06 17:28:11 +0000 |
| commit | 0c8d9ba25fcc154143688b3c6a865e5731d88602 (patch) | |
| tree | 781dfc010d0ecde25aec55fec6772dc87e1d53bf /libmpdemux | |
| parent | 3508f4da088e88cace46c71561a0ecde86bbb7a8 (diff) | |
| download | mpv-0c8d9ba25fcc154143688b3c6a865e5731d88602.tar.bz2 mpv-0c8d9ba25fcc154143688b3c6a865e5731d88602.tar.xz | |
Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three
different places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 7 | ||||
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 11 |
2 files changed, 2 insertions, 16 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 114fb368d7..0b07ffb941 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -33,17 +33,12 @@ #ifdef USE_LIBAVFORMAT_SO #include <ffmpeg/avformat.h> #include <ffmpeg/opt.h> -typedef struct CodecTag { - int id; - unsigned int tag; - unsigned int invalid_asf : 1; -} CodecTag; #else #include "avformat.h" -#include "riff.h" #include "avi.h" #include "opt.h" #endif +#include "riff.h" #define PROBE_BUF_SIZE 2048 diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 0bf7990d3b..f9531a35a8 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -19,19 +19,10 @@ #include "m_option.h" #ifdef USE_LIBAVFORMAT_SO #include <ffmpeg/avformat.h> -typedef struct CodecTag { - int id; - unsigned int tag; - unsigned int invalid_asf : 1; -} CodecTag; -unsigned int codec_get_wav_tag(int id); -enum CodecID codec_get_bmp_id(unsigned int tag); -enum CodecID codec_get_wav_id(unsigned int tag); -enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag); #else #include "avformat.h" -#include "libavformat/riff.h" #endif +#include "libavformat/riff.h" extern const CodecTag mp_wav_tags[]; |