From 6b35f1a2a6432cb79f657ea3fadb86b8e12dddcb Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Wed, 30 May 2012 10:26:53 +0200 Subject: timecode: move timecode muxer options to metadata. Some demuxers set a timecode in the format or streams metadata. The muxers now make use of this metadata instead of a duplicated private option. This makes possible transparent copy of the timecode when transmuxing and transcoding. -timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The global ffmpeg -timecode option will set it anyway so no option change visible for the user. --- libavutil/timecode.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libavutil') diff --git a/libavutil/timecode.h b/libavutil/timecode.h index 41e56d6bfa..da252c1c17 100644 --- a/libavutil/timecode.h +++ b/libavutil/timecode.h @@ -32,12 +32,6 @@ #define AV_TIMECODE_STR_SIZE 16 -#define AV_TIMECODE_OPTION(ctx, string_field, flags) \ - "timecode", "set timecode value following hh:mm:ss[:;.]ff format, " \ - "use ';' or '.' before frame number for drop frame", \ - offsetof(ctx, string_field), \ - AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, flags - enum AVTimecodeFlag { AV_TIMECODE_FLAG_DROPFRAME = 1<<0, ///< timecode is drop frame AV_TIMECODE_FLAG_24HOURSMAX = 1<<1, ///< timecode wraps after 24 hours -- cgit v1.2.3