summaryrefslogtreecommitdiff
path: root/libavformat/rtmpproto.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-11-24 10:02:11 +0200
committerMartin Storsjö <martin@martin.st>2014-11-28 09:59:25 +0200
commit857e6667f9061ae261c0b951113e4efc4329b05e (patch)
tree0a2d68d1482243fe722407e753f201b3703796bd /libavformat/rtmpproto.c
parent1973079417e8701b52ba810a72cb6c7c6f7f9a56 (diff)
rtmpproto: Clarify a comment
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtmpproto.c')
-rw-r--r--libavformat/rtmpproto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9511946fc1..824a100229 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2968,7 +2968,6 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
if (pkttype == RTMP_PT_VIDEO)
channel = RTMP_VIDEO_CHANNEL;
- //force 12bytes header
if (((pkttype == RTMP_PT_VIDEO || pkttype == RTMP_PT_AUDIO) && ts == 0) ||
pkttype == RTMP_PT_NOTIFY) {
if (pkttype == RTMP_PT_NOTIFY)
@@ -2977,6 +2976,9 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
&rt->nb_prev_pkt[1],
channel)) < 0)
return ret;
+ // Force sending a full 12 bytes header by cleaing the
+ // channel id, to make it not match a potential earlier
+ // packet in the same channel.
rt->prev_pkt[1][channel].channel_id = 0;
}