Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mkvtimestamp_v2.c

diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c
index ebb209ba64dfb65467496e26bc27f448e756414d..469b75db4176ec3356c1550b7f504ceab176aa59 100644 (file)
--- a/libavformat/mkvtimestamp_v2.c
+++ b/libavformat/mkvtimestamp_v2.c
@@ -20,12 +20,13 @@
  */
 
 #include "avformat.h"
+#include "internal.h"
 
 static int write_header(AVFormatContext *s)
 {
     static const char *header = "# timecode format v2\n";
     put_buffer(s->pb, header, strlen(header));
-    av_set_pts_info(s->streams[0], 64, 1, 1000);
+    avpriv_set_pts_info(s->streams[0], 64, 1, 1000);
     return 0;
 }
 
@@ -41,13 +42,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 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,
 };