diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-06-23 17:43:19 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-06-23 17:43:19 +0200 |
| commit | 625eb4108675b000626a493c36600062938aaa63 (patch) | |
| tree | 44d4fdd012330e0387d63aa8e265f07151266c4a | |
| parent | 5d75e4667742c851e21dcd6ce70154834fb7d22b (diff) | |
| parent | 371df9ba71393a1c5429d5f40c76348b30e556c7 (diff) | |
| download | ffmpeg-625eb4108675b000626a493c36600062938aaa63.tar.gz | |
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
flvenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| -rw-r--r-- | libavformat/flvenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 6fd7792e28..ccbcf64a99 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -23,6 +23,7 @@ #include "libavutil/dict.h" #include "libavutil/intfloat.h" #include "libavutil/avassert.h" +#include "libavutil/mathematics.h" #include "avc.h" #include "avformat.h" #include "flv.h" @@ -595,6 +596,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) s->event_flags &= ~AVSTREAM_EVENT_FLAG_METADATA_UPDATED; } + avio_write_marker(pb, av_rescale(ts, AV_TIME_BASE, 1000), + pkt->flags & AV_PKT_FLAG_KEY && (flv->video_par ? par->codec_type == AVMEDIA_TYPE_VIDEO : 1) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT); + switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: avio_w8(pb, FLV_TAG_TYPE_VIDEO); |