Mercurial > mplayer.hg

changeset 36783:5df05eaefb67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mp_taglists: Avoid libavformat/internal.h include.
author reimar
date Mon, 17 Feb 2014 23:57:31 +0000
parents 06344efeded3
children db788ca27472
files libmpdemux/mp_taglists.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/mp_taglists.c	Mon Feb 17 23:25:32 2014 +0000
+++ b/libmpdemux/mp_taglists.c	Mon Feb 17 23:57:31 2014 +0000
@@ -23,8 +23,13 @@
 #include "mp_taglists.h"
 #include "libavutil/common.h"
 #include "libavformat/avformat.h"
-// for AVCodecTag
-#include "libavformat/internal.h"
+// this is really defined in libavformat/internal.h
+// but requiring that header is a bit messy when building against
+// a system copy of FFmpeg.
+struct AVCodecTag {
+    enum AVCodecID id;
+    unsigned int tag;
+};
 
 static const struct AVCodecTag mp_wav_tags[] = {
     { AV_CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A') },