hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of octo.ddvtech.com:pls

Browse source
This commit is contained in:
Erik Zandvliet 2011-07-14 09:28:21 +02:00
commit 015af9f741
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Connector_HTTP/main.cpp
View file

@ -271,7 +271,7 @@ namespace Connector_HTTP{
} }
} }
if (tag.isKeyframe){ if (tag.isKeyframe){
if (FlashBuf != ""){ if (FlashBuf != "" && !FlashFirstVideo && !FlashFirstAudio){
Flash_FragBuffer.push(FlashBuf); Flash_FragBuffer.push(FlashBuf);
#if DEBUG >= 4 #if DEBUG >= 4
fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size()); fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
@ -294,7 +294,9 @@ namespace Connector_HTTP{
#if DEBUG >= 5 #if DEBUG >= 5
fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len); fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len);
#endif #endif
FlashBuf.append(tag.data,tag.len); if ((Video_Init.len > 0) && (Audio_Init.len > 0)){
FlashBuf.append(tag.data,tag.len);
}
} else { } else {
FlashMeta = ""; FlashMeta = "";
FlashMeta.append(tag.data+11,tag.len-15); FlashMeta.append(tag.data+11,tag.len-15);