Changeset 695

Timestamp:

11/14/11 03:26:12 (6 months ago)

Author:

shiretu

Message:

-- activated LiveFLV to HLS bridge

Files:

• branches/1.0/sources/thelib/src/protocols/liveflv/innetliveflvstream.cpp (modified) (1 diff)
• trunk/sources/thelib/src/protocols/liveflv/innetliveflvstream.cpp (modified) (1 diff)

branches/1.0/sources/thelib/src/protocols/liveflv/innetliveflvstream.cpp

@@ -101 +101 @@
 bool InNetLiveFLVStream::IsCompatibleWithType(uint64_t type) {
         return TAG_KIND_OF(type, ST_OUT_NET_RTMP)
-                        || TAG_KIND_OF(type, ST_OUT_NET_RTP);
+                        || TAG_KIND_OF(type, ST_OUT_NET_RTP)
+                        || TAG_KIND_OF(type, ST_OUT_FILE_HLS);
 }
 

trunk/sources/thelib/src/protocols/liveflv/innetliveflvstream.cpp

@@ -101 +101 @@
 bool InNetLiveFLVStream::IsCompatibleWithType(uint64_t type) {
         return TAG_KIND_OF(type, ST_OUT_NET_RTMP)
-                        || TAG_KIND_OF(type, ST_OUT_NET_RTP);
+                        || TAG_KIND_OF(type, ST_OUT_NET_RTP)
+                        || TAG_KIND_OF(type, ST_OUT_FILE_HLS);
 }