diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-18 20:22:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-18 20:22:47 +0100 |
| commit | c0586b257d9c451747d00ce0d1c5bbdcbe9f4ec5 (patch) | |
| tree | 8f02a46d84c6be9210c515313154e6994522dad9 /libavformat/rtpenc.c | |
| parent | 4d5ca069c775b84a302ae295d11b6ce639cfb902 (diff) | |
| parent | 01f251c44d83eedc819625d2caac9ff9697a085d (diff) | |
| download | ffmpeg-c0586b257d9c451747d00ce0d1c5bbdcbe9f4ec5.tar.gz | |
Merge commit '01f251c44d83eedc819625d2caac9ff9697a085d'
* commit '01f251c44d83eedc819625d2caac9ff9697a085d':
rtpenc: Set the timestamp properly when sending mpegts data, too
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index c608dfb46a..43bfc94845 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -456,6 +456,7 @@ static void rtp_send_mpegts_raw(AVFormatContext *s1, RTPMuxContext *s = s1->priv_data; int len, out_len; + s->timestamp = s->cur_timestamp; while (size >= TS_PACKET_SIZE) { len = s->max_payload_size - (s->buf_ptr - s->buf); if (len > size) |