diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-01-18 07:59:49 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-01-18 08:00:23 +0100 |
| commit | 54bc6403620286f595becd01842947395020e2f4 (patch) | |
| tree | 1aad3d5778f3c2563eddf8fdfae5a6e99407140c /libavformat | |
| parent | d9c3e5f6d8aab10a10f9f17fa3c0a207c45b2f54 (diff) | |
| download | ffmpeg-54bc6403620286f595becd01842947395020e2f4.tar.gz | |
Missing parts of IVF muxer support.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 67462c40fe..d3c849ab69 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -109,6 +109,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o +OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d543ad10e1..5fa97efa0b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -109,7 +109,7 @@ void av_register_all(void) REGISTER_MUXER (IPOD, ipod); REGISTER_DEMUXER (ISS, iss); REGISTER_DEMUXER (IV8, iv8); - REGISTER_DEMUXER (IVF, ivf); + REGISTER_MUXDEMUX (IVF, ivf); REGISTER_DEMUXER (LMLM4, lmlm4); REGISTER_DEMUXER (LXF, lxf); REGISTER_MUXDEMUX (M4V, m4v); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 919933ff68..b484649693 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 93 +#define LIBAVFORMAT_VERSION_MINOR 94 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |