Commit a2403986 authored by Zhentan Feng's avatar Zhentan Feng Committed by Ronald S. Bultje
Browse files

MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e34d5db5
......@@ -6,6 +6,7 @@ version <next>:
- WebM support in Matroska demuxer
- low overhead Ogg muxing
- MMS-TCP support
......
......@@ -687,6 +687,7 @@ performance on systems without hardware floating point support).
@item file @tab X
@item Gopher @tab X
@item HTTP @tab X
@item MMS @tab X
@item pipe @tab X
@item RTP @tab X
@item TCP @tab X
......
......@@ -275,6 +275,7 @@ OBJS+= avio.o aviobuf.o
OBJS-$(CONFIG_FILE_PROTOCOL) += file.o
OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o
OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o httpauth.o
OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o asf.o
OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
# external or internal rtmp
......
......@@ -219,6 +219,7 @@ void av_register_all(void)
REGISTER_PROTOCOL (FILE, file);
REGISTER_PROTOCOL (GOPHER, gopher);
REGISTER_PROTOCOL (HTTP, http);
REGISTER_PROTOCOL (MMST, mmst);
REGISTER_PROTOCOL (PIPE, pipe);
REGISTER_PROTOCOL (RTMP, rtmp);
#if CONFIG_LIBRTMP
......
......@@ -22,8 +22,8 @@
#define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 64
#define LIBAVFORMAT_VERSION_MICRO 1
#define LIBAVFORMAT_VERSION_MINOR 65
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
......
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