Merge commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:34:25 +0000 (18:34 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 21:34:25 +0000 (18:34 -0300)
* commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c':
  rtmp: Correctly handle the Window Acknowledgement Size packets

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/rtmpproto.c

@@@ -93,9 -93,9 +93,9 @@@ typedef struct RTMPContext 
      int           flv_off;                    ///< number of bytes read from current buffer
      int           flv_nb_packets;             ///< number of flv packets published
      RTMPPacket    out_pkt;                    ///< rtmp packet, created from flv a/v or metadata (for output)
-     uint32_t      client_report_size;         ///< number of bytes after which client should report to server
+     uint32_t      receive_report_size;        ///< number of bytes after which we should report the number of received bytes to the peer
 -    uint32_t      bytes_read;                 ///< number of bytes read from server
 -    uint32_t      last_bytes_read;            ///< number of bytes read last reported to server
 +    uint64_t      bytes_read;                 ///< number of bytes read from server
 +    uint64_t      last_bytes_read;            ///< number of bytes read last reported to server
      uint32_t      last_timestamp;             ///< last timestamp received in a packet
      int           skip_bytes;                 ///< number of bytes to skip from the input FLV stream in the next write call
      int           has_audio;                  ///< presence of audio data