Signed-off-by: Derek Buitenhuis <[email protected]>
---
doc/APIchanges | 3 +++
libavformat/Makefile | 7 ++++---
libavformat/avformat.h | 6 ++++++
libavformat/utils.c | 6 ++++++
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index dca33aa..23b5210 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first:
+2012-05-30 - xxxxxxx - lavf 54.3.0
+ Add avformat_get_mkv_codec_tags()
+
2012-05-25 - e0e0793 - lavu 51.31.0 - opt.h
Add av_opt_set_bin()
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0e041d1..a74757d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -11,6 +11,7 @@ OBJS = allformats.o \
cutils.o \
id3v1.o \
id3v2.o \
+ matroska.o \
metadata.o \
options.o \
os_support.o \
@@ -127,9 +128,9 @@ OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o
OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o
OBJS-$(CONFIG_M4V_MUXER) += rawenc.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
+OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o \
isom.o rmdec.o rm.o
-OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
+OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o \
isom.o avc.o \
flacenc_header.o avlanguage.o
OBJS-$(CONFIG_MD5_MUXER) += md5enc.o
@@ -312,7 +313,7 @@ OBJS-$(CONFIG_W64_DEMUXER) += wav.o pcm.o
OBJS-$(CONFIG_WAV_DEMUXER) += wav.o pcm.o
OBJS-$(CONFIG_WAV_MUXER) += wav.o
OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
-OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
+OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o \
isom.o avc.o \
flacenc_header.o avlanguage.o
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 040e35e..a3ba7f3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -321,6 +321,7 @@ typedef struct AVFrac {
/* input/output formats */
struct AVCodecTag;
+struct CodecTags;
/**
* This structure contains the data a format has to probe a file.
@@ -1722,6 +1723,11 @@ const struct AVCodecTag
*avformat_get_riff_audio_tags(void);
*/
/**
+ * @return the table mapping Matroska Codec IDs to libavcodec CodecIDs.
+ */
+const struct CodecTags *avformat_get_mkv_codec_tags(void);
+
+/**
* @}
*/
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4387521..84cc9f5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -36,6 +36,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/parseutils.h"
#include "riff.h"
+#include "matroska.h"
#include "audiointerleave.h"
#include "url.h"
#include <sys/time.h>
@@ -3945,3 +3946,8 @@ const struct AVCodecTag
*avformat_get_riff_audio_tags(void)
{
return ff_codec_wav_tags;
}
+
+const CodecTags *avformat_get_mkv_codec_tags(void)
+{
+ return ff_mkv_codec_tags;
+}
--
1.7.10
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
