summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2014-01-19 21:50:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-19 22:15:32 +0100
commit1a193c438c9bde825dbe7965e3543cb5ad14309e (patch)
treea247d93887585f6128485311dc9e24b2c837a428 /libavformat
parentfde2afd9fb6e8645ccb4d3610403ce95af51a16b (diff)
lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h8
-rw-r--r--libavformat/isom.c9
-rw-r--r--libavformat/version.h2
3 files changed, 18 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 6d719d7985..30fc8dbbf5 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2188,6 +2188,14 @@ const struct AVCodecTag *avformat_get_riff_video_tags(void);
* @return the table mapping RIFF FourCCs for audio to AVCodecID.
*/
const struct AVCodecTag *avformat_get_riff_audio_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for video to libavcodec AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_video_tags(void);
+/**
+ * @return the table mapping MOV FourCCs for audio to AVCodecID.
+ */
+const struct AVCodecTag *avformat_get_mov_audio_tags(void);
/**
* @}
diff --git a/libavformat/isom.c b/libavformat/isom.c
index f6a4646f7a..3aeb231ace 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -574,3 +574,12 @@ void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout)
avio_wb32(pb, 0); // mNumberChannelDescriptions
}
+const struct AVCodecTag *avformat_get_mov_video_tags(void)
+{
+ return ff_codec_movvideo_tags;
+}
+
+const struct AVCodecTag *avformat_get_mov_audio_tags(void)
+{
+ return ff_codec_movaudio_tags;
+}
diff --git a/libavformat/version.h b/libavformat/version.h
index 40c56c9669..0609e4fce9 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 24
+#define LIBAVFORMAT_VERSION_MINOR 25
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \