ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Mon Nov 24 10:02:11 2014 +0200| [857e6667f9061ae261c0b951113e4efc4329b05e] | committer: Martin Storsjö
rtmpproto: Clarify a comment Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=857e6667f9061ae261c0b951113e4efc4329b05e --- libavformat/rtmpproto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 9511946..824a100 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
