Author: spyfeng
Date: Mon Aug 2 17:58:36 2010
New Revision: 5885
Log:
remove "mms" protocol from mmsh.c, because we intend mmsh://
as mms protocol over http.
Modified:
mms/Makefile_mmsh.patch
mms/mmsh.c
Modified: mms/Makefile_mmsh.patch
==============================================================================
--- mms/Makefile_mmsh.patch Mon Aug 2 17:47:34 2010 (r5884)
+++ mms/Makefile_mmsh.patch Mon Aug 2 17:58:36 2010 (r5885)
@@ -2,12 +2,11 @@ Index: libavformat/Makefile
===================================================================
--- libavformat/Makefile (revision 24643)
+++ libavformat/Makefile (working copy)
-@@ -287,7 +287,9 @@
+@@ -287,7 +287,8 @@
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_MMS_PROTOCOL) += mmsh.o mms.o asf.o
+OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o
+OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o
OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o
@@ -17,11 +16,10 @@ Index: libavformat/allformats.c
===================================================================
--- libavformat/allformats.c (revision 24643)
+++ libavformat/allformats.c (working copy)
-@@ -225,6 +225,8 @@
+@@ -225,6 +225,7 @@
REGISTER_PROTOCOL (FILE, file);
REGISTER_PROTOCOL (GOPHER, gopher);
REGISTER_PROTOCOL (HTTP, http);
-+ REGISTER_PROTOCOL (MMS, mms);
+ REGISTER_PROTOCOL (MMSH, mmsh);
REGISTER_PROTOCOL (MMST, mmst);
REGISTER_PROTOCOL (MD5, md5);
Modified: mms/mmsh.c
==============================================================================
--- mms/mmsh.c Mon Aug 2 17:47:34 2010 (r5884)
+++ mms/mmsh.c Mon Aug 2 17:58:36 2010 (r5885)
@@ -363,15 +363,6 @@ static int mmsh_read(URLContext *h, uint
return res;
}
-URLProtocol mms_protocol = {
- "mms",
- mmsh_open,
- mmsh_read,
- NULL, // write
- NULL, // seek
- mmsh_close,
-};
-
URLProtocol mmsh_protocol = {
"mmsh",
mmsh_open,
_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
