diff options
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavformat/avformat.h | 8 | ||||
| -rw-r--r-- | libavformat/isom.c | 9 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 69a2c5a638..eaddc9b0bc 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-01-19 - xxxxxxx - lavf 55.25.100 - avformat.h + Add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags(). + 2014-01-19 - xxxxxxx - lavu 52.63.100 - rational.h Add av_make_q() function. 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, \ |