aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-15 20:27:17 +0100
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-16 01:13:38 +0100
commit4a30277a59ef1fafa391682a3fe06b49a99d98b7 (patch)
treecb459323aa035903286628d946998320dbcd289b /libavcodec
parentc544ffd2aeab766293eeab326c604a11bbd4ecee (diff)
downloadffmpeg-4a30277a59ef1fafa391682a3fe06b49a99d98b7.tar.gz
lavc/options: set timecode_frame_start to -1 as option default
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/options.c1
-rw-r--r--libavcodec/options_table.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 461e4a13f0..ae5e5d560b 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 5dd0359a52..1d5b07884a 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