Commit 438debd0 authored by zhentan feng's avatar zhentan feng Committed by Michael Niedermayer

WTV muxer (2_wtvenc.patch, 3_add_wtv_muxer.patch)

parent d06c5b44
...@@ -50,6 +50,7 @@ easier to use. The changes are: ...@@ -50,6 +50,7 @@ easier to use. The changes are:
- LATM muxer - LATM muxer
- Speex encoder via libspeex - Speex encoder via libspeex
- JSON output in ffprobe - JSON output in ffprobe
- WTV muxer
version 0.8: version 0.8:
......
...@@ -305,6 +305,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o ...@@ -305,6 +305,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \ OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \
avlanguage.o mpegts.o isom.o riff.o avlanguage.o mpegts.o isom.o riff.o
OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv.o asf.o riff.o
OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o
OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o
OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o
......
...@@ -226,7 +226,7 @@ void av_register_all(void) ...@@ -226,7 +226,7 @@ void av_register_all(void)
REGISTER_MUXER (WEBM, webm); REGISTER_MUXER (WEBM, webm);
REGISTER_DEMUXER (WSAUD, wsaud); REGISTER_DEMUXER (WSAUD, wsaud);
REGISTER_DEMUXER (WSVQA, wsvqa); REGISTER_DEMUXER (WSVQA, wsvqa);
REGISTER_DEMUXER (WTV, wtv); REGISTER_MUXDEMUX (WTV, wtv);
REGISTER_DEMUXER (WV, wv); REGISTER_DEMUXER (WV, wv);
REGISTER_DEMUXER (XA, xa); REGISTER_DEMUXER (XA, xa);
REGISTER_DEMUXER (XMV, xmv); REGISTER_DEMUXER (XMV, xmv);
......
This diff is collapsed.
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