MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvtimestamp v2 muxer: rename so as to avoid confusion with SMPTE timecodes.

Browse Source 
Requested-by: Baptiste Coudurier
Approved-by: David Conrad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-27 01:48:28 +02:00
parent 17c95361e9
commit 46eae15567
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

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

2
libavformat/allformats.c
View File

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

6
libavformat/timecode_v2.c → libavformat/mkvtimestamp_v2.c
View File

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