[FFmpeg-cvslog] Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'

Clément Bœsch git at videolan.org
Thu Mar 23 17:37:21 EET 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 16:36:05 2017 +0100| [d1c341f77b0196947027c8a918b93a187c5dc860] | committer: Clément Bœsch

Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'

* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830':
  rtmpproto: Send chunk size on the network channel

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1c341f77b0196947027c8a918b93a187c5dc860
---

 libavformat/rtmpproto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 83ab296..ef2772e 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -521,7 +521,7 @@ static int read_connect(URLContext *s, RTMPContext *rt)
         return ret;
 
     // Chunk size
-    if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL,
+    if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL,
                                      RTMP_PT_CHUNK_SIZE, 0, 4)) < 0)
         return ret;
 


======================================================================




More information about the ffmpeg-cvslog mailing list