Mercurial > mplayer.hg

changeset 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 2a0a1f974172
children 02b934e18af4
files libmpcodecs/ae_lavc.c libmpdemux/demux_lavf.c libmpdemux/muxer_lavf.c
diffstat 3 files changed, 3 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ae_lavc.c	Sat Jan 06 15:08:04 2007 +0000
+++ b/libmpcodecs/ae_lavc.c	Sat Jan 06 17:28:11 2007 +0000
@@ -31,17 +31,10 @@
 #if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
 #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);
-unsigned int codec_get_tag(const CodecTag *tags, int id);
 #else
 #include "libavformat/avformat.h"
+#endif
 #include "libavformat/riff.h"
-#endif
 extern const CodecTag mp_wav_tags[];
 #endif
 
--- a/libmpdemux/demux_lavf.c	Sat Jan 06 15:08:04 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Sat Jan 06 17:28:11 2007 +0000
@@ -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
 
--- a/libmpdemux/muxer_lavf.c	Sat Jan 06 15:08:04 2007 +0000
+++ b/libmpdemux/muxer_lavf.c	Sat Jan 06 17:28:11 2007 +0000
@@ -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"
+#endif
 #include "libavformat/riff.h"
-#endif
 
 extern const CodecTag mp_wav_tags[];