[MPlayer-cvslog] r21840 - in trunk: libmpcodecs/ae_lavc.c libmpdemux/demux_lavf.c libmpdemux/muxer_lavf.c

[reimar]

Author: reimar
Date: Sat Jan  6 18:28:11 2007
New Revision: 21840

Modified:
   trunk/libmpcodecs/ae_lavc.c
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/muxer_lavf.c

Log:
Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three
different places.


Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c	(original)
+++ trunk/libmpcodecs/ae_lavc.c	Sat Jan  6 18:28:11 2007
@@ -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"
-#include "libavformat/riff.h"
 #endif
+#include "libavformat/riff.h"
 extern const CodecTag mp_wav_tags[];
 #endif
 

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Sat Jan  6 18:28:11 2007
@@ -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
 

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	(original)
+++ trunk/libmpdemux/muxer_lavf.c	Sat Jan  6 18:28:11 2007
@@ -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[];