[FFmpeg-cvslog] lavc/options: set timecode_frame_start to -1 as option default

Lukasz Marek git at videolan.org
Sun Nov 16 01:13:52 CET 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sat Nov 15 20:27:17 2014 +0100| [4a30277a59ef1fafa391682a3fe06b49a99d98b7] | committer: Lukasz Marek

lavc/options: set timecode_frame_start to -1 as option default

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a30277a59ef1fafa391682a3fe06b49a99d98b7
---

 libavcodec/options.c       |    1 -
 libavcodec/options_table.h |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 461e4a1..ae5e5d5 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -115,7 +115,6 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
     s->sample_aspect_ratio = (AVRational){0,1};
     s->pix_fmt             = AV_PIX_FMT_NONE;
     s->sample_fmt          = AV_SAMPLE_FMT_NONE;
-    s->timecode_frame_start = -1;
 
     s->reordered_opaque    = AV_NOPTS_VALUE;
     if(codec && codec->priv_data_size){
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 5dd0359..1d5b078 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -398,7 +398,7 @@ static const AVOption avcodec_options[] = {
 {"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E},
 {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E},
 {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E},
-{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = 0 }, -1, INT64_MAX, V|E},
+{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E},
 #if FF_API_REQUEST_CHANNELS
 {"request_channels", "set desired number of audio channels", OFFSET(request_channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D},
 #endif



More information about the ffmpeg-cvslog mailing list