[FFmpeg-devel] [PATCH 1/2] lavf/microdvd: fix muxing.

[Clément Bœsch]

This was broken since 1f265f52.
---
 libavformat/Makefile      |  2 +-
 libavformat/microdvdenc.c | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index ad70c12..0f2e5df 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -196,7 +196,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
 OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
 OBJS-$(CONFIG_MGSTS_DEMUXER)             += mgsts.o
 OBJS-$(CONFIG_MICRODVD_DEMUXER)          += microdvddec.o
-OBJS-$(CONFIG_MICRODVD_MUXER)            += microdvdenc.o rawenc.o
+OBJS-$(CONFIG_MICRODVD_MUXER)            += microdvdenc.o
 OBJS-$(CONFIG_MJPEG_DEMUXER)             += rawdec.o
 OBJS-$(CONFIG_MJPEG_MUXER)               += rawenc.o
 OBJS-$(CONFIG_MLP_DEMUXER)               += rawdec.o
diff --git a/libavformat/microdvdenc.c b/libavformat/microdvdenc.c
index ba97444..db1024e 100644
--- a/libavformat/microdvdenc.c
+++ b/libavformat/microdvdenc.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <inttypes.h>
 #include "avformat.h"
-#include "rawenc.h"
 
 static int microdvd_write_header(struct AVFormatContext *s)
 {
@@ -39,13 +39,31 @@ static int microdvd_write_header(struct AVFormatContext *s)
     return 0;
 }
 
+static int microdvd_write_packet(AVFormatContext *avf, AVPacket *pkt)
+{
+    AVRational tb  = avf->streams[0]->time_base;
+    AVRational tbc = avf->streams[0]->codec->time_base;
+
+    avio_printf(avf->pb, "{%"PRId64"}", av_rescale_q(pkt->pts, tb, tbc));
+    if (pkt->duration < 0) {
+        avio_write(avf->pb, "{}", 2);
+    } else {
+        int64_t end = av_rescale_q(pkt->pts + pkt->duration, tb, tbc);
+        avio_printf(avf->pb, "{%"PRId64"}", end);
+    }
+    avio_write(avf->pb, pkt->data, pkt->size);
+    avio_write(avf->pb, "\n", 1);
+    avio_flush(avf->pb);
+    return 0;
+}
+
 AVOutputFormat ff_microdvd_muxer = {
     .name           = "microdvd",
     .long_name      = NULL_IF_CONFIG_SMALL("MicroDVD subtitle format"),
     .mime_type      = "text/x-microdvd",
     .extensions     = "sub",
     .write_header   = microdvd_write_header,
-    .write_packet   = ff_raw_write_packet,
+    .write_packet   = microdvd_write_packet,
     .flags          = AVFMT_NOTIMESTAMPS,
     .subtitle_codec = AV_CODEC_ID_MICRODVD,
 };
-- 
1.8.1.4