Re: [FFmpeg-devel] [PATCH 1/2] lavc/options: set timecode_frame_start to -1 as option default

[Michael Niedermayer]

On Sat, Nov 15, 2014 at 09:07:12PM +0100, Lukasz Marek wrote:
> Signed-off-by: Lukasz Marek <lukasz.m.lu...@gmail.com>
> ---
>  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

probably ok

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.

signature.asc
Description: Digital signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel