From 46eae15567bcc08ca058636fbea21bd997ab9d6c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 27 Oct 2011 01:48:28 +0200 Subject: mkvtimestamp v2 muxer: rename so as to avoid confusion with SMPTE timecodes. Requested-by: Baptiste Coudurier Approved-by: David Conrad Signed-off-by: Michael Niedermayer --- libavformat/Makefile | 2 +- libavformat/allformats.c | 2 +- libavformat/mkvtimestamp_v2.c | 53 +++++++++++++++++++++++++++++++++++++++++++ libavformat/timecode_v2.c | 53 ------------------------------------------- 4 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 libavformat/mkvtimestamp_v2.c delete mode 100644 libavformat/timecode_v2.c (limited to 'libavformat') diff --git a/libavformat/Makefile b/libavformat/Makefile index 32fac6a8e9..3c87ab44f3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -296,7 +296,7 @@ OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o OBJS-$(CONFIG_SWF_MUXER) += swfenc.o OBJS-$(CONFIG_THP_DEMUXER) += thp.o OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o -OBJS-$(CONFIG_TIMECODE_V2_MUXER) += timecode_v2.o +OBJS-$(CONFIG_MKVTIMESTAMP_V2_MUXER) += mkvtimestamp_v2.o OBJS-$(CONFIG_TMV_DEMUXER) += tmv.o OBJS-$(CONFIG_TRUEHD_DEMUXER) += rawdec.o OBJS-$(CONFIG_TRUEHD_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 23d568c017..c4b27e43cd 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -219,7 +219,7 @@ void av_register_all(void) REGISTER_MUXER (TGP, tgp); REGISTER_DEMUXER (THP, thp); REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq); - REGISTER_MUXER (TIMECODE_V2, timecode_v2); + REGISTER_MUXER (MKVTIMESTAMP_V2, mkvtimestamp_v2); REGISTER_DEMUXER (TMV, tmv); REGISTER_MUXDEMUX (TRUEHD, truehd); REGISTER_DEMUXER (TTA, tta); diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c new file mode 100644 index 0000000000..ebb209ba64 --- /dev/null +++ b/libavformat/mkvtimestamp_v2.c @@ -0,0 +1,53 @@ +/* + * extract pts as timecode v2, as defined by mkvtoolnix + * Copyright (c) 2009 David Conrad + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.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); + return 0; +} + +static int write_packet(AVFormatContext *s, AVPacket *pkt) +{ + char buf[256]; + 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); + 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, +}; diff --git a/libavformat/timecode_v2.c b/libavformat/timecode_v2.c deleted file mode 100644 index c8c4cf7774..0000000000 --- a/libavformat/timecode_v2.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * extract pts as timecode v2, as defined by mkvtoolnix - * Copyright (c) 2009 David Conrad - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "avformat.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); - return 0; -} - -static int write_packet(AVFormatContext *s, AVPacket *pkt) -{ - char buf[256]; - 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); - return 0; -} - -AVOutputFormat ff_timecode_v2_muxer = { - "timecode_v2", - NULL_IF_CONFIG_SMALL("timecode format v2"), - NULL, - "", - 0, - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - write_header, - write_packet, -}; -- cgit v1.2.3