eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'

Browse Source 
* commit '92ed83e393d25b6d15920e90d56ee77de54a9728':
  rtmp: Store all the notify messages

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-17 11:39:41 +02:00
parent 9589b61904 92ed83e393
commit a275ff7e01
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtmpproto.c
View File

@@ -2085,10 +2085,9 @@ static int handle_notify(URLContext *s, RTMPPacket *pkt) {
if (ff_amf_read_string(&gbc, statusmsg, if (ff_amf_read_string(&gbc, statusmsg,
sizeof(statusmsg), &stringlen)) sizeof(statusmsg), &stringlen))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (strcmp(statusmsg, "onMetaData")) { } else {
av_log(s, AV_LOG_INFO, "Expecting onMetadata but got %s\n", datatowrite = pkt->data;
statusmsg); datatowritelength = pkt->size;
return 0;
} }
/* Provide ECMAArray to flv */ /* Provide ECMAArray to flv */
@@ -2117,7 +2116,7 @@ static int handle_notify(URLContext *s, RTMPPacket *pkt) {
bytestream2_put_be24(&pbc, 0); bytestream2_put_be24(&pbc, 0);
bytestream2_put_buffer(&pbc, datatowrite, datatowritelength); bytestream2_put_buffer(&pbc, datatowrite, datatowritelength);
bytestream2_put_be32(&pbc, 0); bytestream2_put_be32(&pbc, 0);
}
return 0; return 0;
} }