Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mkvtimestamp_v2.c

diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c
index f12046005723a79e6de52b476c95d43e8045941d..b04c655f7f22fda9dadbb29223ca3f8fa75bffe4 100644 (file)
--- a/libavformat/mkvtimestamp_v2.c
+++ b/libavformat/mkvtimestamp_v2.c
@@ -25,7 +25,7 @@
 static int write_header(AVFormatContext *s)
 {
     static const char *header = "# timecode format v2\n";
-    put_buffer(s->pb, header, strlen(header));
+    avio_write(s->pb, header, strlen(header));
     avpriv_set_pts_info(s->streams[0], 64, 1, 1000);
     return 0;
 }
@@ -36,19 +36,16 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     if (pkt->stream_index)
         av_log(s, AV_LOG_WARNING, "More than one stream unsupported\n");
     snprintf(buf, sizeof(buf), "%" PRId64 "\n", pkt->dts);
-    put_buffer(s->pb, buf, strlen(buf));
-    put_flush_packet(s->pb);
+    avio_write(s->pb, buf, strlen(buf));
+    avio_flush(s->pb);
     return 0;
 }
 
 AVOutputFormat ff_mkvtimestamp_v2_muxer = {
-    "mkvtimestamp_v2",
-    NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"),
-    NULL,
-    "",
-    0,
-    CODEC_ID_NONE,
-    CODEC_ID_RAWVIDEO,
-    write_header,
-    write_packet,
+    .name         = "mkvtimestamp_v2",
+    .long_name    = NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"),
+    .audio_codec  = CODEC_ID_NONE,
+    .video_codec  = CODEC_ID_RAWVIDEO,
+    .write_header = write_header,
+    .write_packet = write_packet,
 };