virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'

Browse Source 
* commit '857e6667f9061ae261c0b951113e4efc4329b05e':
  rtmpproto: Clarify a comment

Conflicts:
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-28 11:35:08 +01:00
parent ea38e5a6b7 857e6667f9
commit a105c1f204
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtmpproto.c
View File

@@ -3021,6 +3021,9 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
&rt->nb_prev_pkt[1], &rt->nb_prev_pkt[1],
channel)) < 0) channel)) < 0)
return ret; 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; rt->prev_pkt[1][channel].channel_id = 0;
} }