RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/microdvd: fix muxing. 

This was broken since 1f265f52.
This commit is contained in:
Clément Bœsch 2013-02-20 23:43:25 +01:00
parent 580e228557
commit 7346354b55
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -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

21
libavformat/microdvdenc.c
View File

@ -19,12 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <inttypes.h>
#include "avformat.h"
#include "rawenc.h"
#include "internal.h"
static int microdvd_write_header(struct AVFormatContext *s)
{
AVCodecContext *avctx = s->streams[0]->codec;
AVRational tb = avctx->time_base;
if (s->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_MICRODVD) {
av_log(s, AV_LOG_ERROR, "Exactly one MicroDVD stream is needed.\n");
@ -36,6 +38,21 @@ static int microdvd_write_header(struct AVFormatContext *s)
avio_write(s->pb, avctx->extradata, avctx->extradata_size);
avio_flush(s->pb);
}
avpriv_set_pts_info(s->streams[0], 64, tb.num, tb.den);
return 0;
}
static int microdvd_write_packet(AVFormatContext *avf, AVPacket *pkt)
{
avio_printf(avf->pb, "{%"PRId64"}", pkt->pts);
if (pkt->duration < 0)
avio_write(avf->pb, "{}", 2);
else
avio_printf(avf->pb, "{%"PRId64"}", pkt->pts + pkt->duration);
avio_write(avf->pb, pkt->data, pkt->size);
avio_write(avf->pb, "\n", 1);
avio_flush(avf->pb);
return 0;
}
@ -45,7 +62,7 @@ AVOutputFormat ff_microdvd_muxer = {
.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,
};