[FFmpeg-cvslog] Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Thu Jun 23 17:43:19 2016 +0200| [625eb4108675b000626a493c36600062938aaa63] | committer: Matthieu Bouron

Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=625eb4108675b000626a493c36600062938aaa63
---

 libavformat/flvenc.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 6fd7792..ccbcf64 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);


======================================================================

diff --cc libavformat/flvenc.c
index 6fd7792,00bd65c..ccbcf64
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@@ -19,10 -19,9 +19,11 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#include "libavutil/intreadwrite.h"
  #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"