Commit 54bc6403 authored by Reimar Döffinger's avatar Reimar Döffinger

Missing parts of IVF muxer support.

parent d9c3e5f6
...@@ -73,6 +73,7 @@ version <next>: ...@@ -73,6 +73,7 @@ version <next>:
- floating-point AC-3 encoder added - floating-point AC-3 encoder added
- Lagarith decoder - Lagarith decoder
- ffmpeg -copytb option added - ffmpeg -copytb option added
- IVF muxer added
version 0.6: version 0.6:
......
...@@ -110,7 +110,7 @@ library: ...@@ -110,7 +110,7 @@ library:
@tab Format used in various Interplay computer games. @tab Format used in various Interplay computer games.
@item IV8 @tab @tab X @item IV8 @tab @tab X
@tab A format generated by IndigoVision 8000 video server. @tab A format generated by IndigoVision 8000 video server.
@item IVF (On2) @tab @tab X @item IVF (On2) @tab X @tab X
@tab A format used by libvpx @tab A format used by libvpx
@item LMLM4 @tab @tab X @item LMLM4 @tab @tab X
@tab Used by Linux Media Labs MPEG-4 PCI boards @tab Used by Linux Media Labs MPEG-4 PCI boards
......
...@@ -109,6 +109,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o ...@@ -109,6 +109,7 @@ OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
OBJS-$(CONFIG_ISS_DEMUXER) += iss.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o
OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o
OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o
OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o
OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o
OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o
......
...@@ -109,7 +109,7 @@ void av_register_all(void) ...@@ -109,7 +109,7 @@ void av_register_all(void)
REGISTER_MUXER (IPOD, ipod); REGISTER_MUXER (IPOD, ipod);
REGISTER_DEMUXER (ISS, iss); REGISTER_DEMUXER (ISS, iss);
REGISTER_DEMUXER (IV8, iv8); REGISTER_DEMUXER (IV8, iv8);
REGISTER_DEMUXER (IVF, ivf); REGISTER_MUXDEMUX (IVF, ivf);
REGISTER_DEMUXER (LMLM4, lmlm4); REGISTER_DEMUXER (LMLM4, lmlm4);
REGISTER_DEMUXER (LXF, lxf); REGISTER_DEMUXER (LXF, lxf);
REGISTER_MUXDEMUX (M4V, m4v); REGISTER_MUXDEMUX (M4V, m4v);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 93 #define LIBAVFORMAT_VERSION_MINOR 94
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment