diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-27 01:48:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-13 05:19:28 +0100 |
| commit | 46eae15567bcc08ca058636fbea21bd997ab9d6c (patch) | |
| tree | 93b143f5b5403ba209d754e121673e354e37a30f /libavformat | |
| parent | 17c95361e92e2b223eb33c137c05ff8a6f4347fd (diff) | |
| download | ffmpeg-46eae15567bcc08ca058636fbea21bd997ab9d6c.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/mkvtimestamp_v2.c (renamed from libavformat/timecode_v2.c) | 6 |
3 files changed, 5 insertions, 5 deletions
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/timecode_v2.c b/libavformat/mkvtimestamp_v2.c index c8c4cf7774..ebb209ba64 100644 --- a/libavformat/timecode_v2.c +++ b/libavformat/mkvtimestamp_v2.c @@ -40,9 +40,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -AVOutputFormat ff_timecode_v2_muxer = { - "timecode_v2", - NULL_IF_CONFIG_SMALL("timecode format v2"), +AVOutputFormat ff_mkvtimestamp_v2_muxer = { + "mkvtimestamp_v2", + NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"), NULL, "", 0, |