On Sun, Nov 6, 2011 at 2:29 PM, Anton Khirnov <[email protected]> wrote: > --- > avconv.c | 19 ++++++++----------- > 1 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/avconv.c b/avconv.c > index a9fe3f2..ed2468e 100644 > --- a/avconv.c > +++ b/avconv.c > @@ -2793,7 +2793,6 @@ static void add_input_streams(OptionsContext *o, > AVFormatContext *ic) > AVStream *st = ic->streams[i]; > AVCodecContext *dec = st->codec; > InputStream *ist; > - double scale = 1.0; > > input_streams = grow_array(input_streams, sizeof(*input_streams), > &nb_input_streams, nb_input_streams + 1); > ist = &input_streams[nb_input_streams - 1]; > @@ -2802,8 +2801,8 @@ static void add_input_streams(OptionsContext *o, > AVFormatContext *ic) > ist->discard = 1; > ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, > ic, st); > > - MATCH_PER_STREAM_OPT(ts_scale, dbl, scale, ic, st); > - ist->ts_scale = scale; > + ist->ts_scale = 1.0; > + MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); > > ist->dec = choose_decoder(o, ic, st); > > @@ -3111,7 +3110,6 @@ static OutputStream *new_output_stream(OptionsContext > *o, AVFormatContext *oc, e > OutputStream *ost; > AVStream *st = avformat_new_stream(oc, NULL); > int idx = oc->nb_streams - 1, ret = 0; > - int64_t max_frames = INT64_MAX; > char *bsf = NULL, *next, *codec_tag = NULL; > AVBitStreamFilterContext *bsfc, *bsfc_prev = NULL; > double qscale = -1; > @@ -3166,8 +3164,8 @@ static OutputStream *new_output_stream(OptionsContext > *o, AVFormatContext *oc, e > exit_program(1); > } > > - MATCH_PER_STREAM_OPT(max_frames, i64, max_frames, oc, st); > - ost->max_frames = max_frames; > + ost->max_frames = INT64_MAX; > + MATCH_PER_STREAM_OPT(max_frames, i64, ost->max_frames, oc, st); > > MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st); > while (bsf) { > @@ -3239,7 +3237,7 @@ static OutputStream *new_video_stream(OptionsContext > *o, AVFormatContext *oc) > char *forced_key_frames = NULL, *frame_rate = NULL, *frame_size = > NULL; > char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; > char *intra_matrix = NULL, *inter_matrix = NULL, *filters = NULL; > - int i, force_fps = 0, top_field_first = -1; > + int i; > > MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); > if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < > 0) { > @@ -3323,11 +3321,10 @@ static OutputStream *new_video_stream(OptionsContext > *o, AVFormatContext *oc) > if (forced_key_frames) > parse_forced_key_frames(forced_key_frames, ost, video_enc); > > - MATCH_PER_STREAM_OPT(force_fps, i, force_fps, oc, st); > - ost->force_fps = force_fps; > + MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st);
That one took me some time to understand why this compiles after all, but seems OK. > > - MATCH_PER_STREAM_OPT(top_field_first, i, top_field_first, oc, st); > - ost->top_field_first = top_field_first; > + ost->top_field_first = -1; > + MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, > st); here as well. > > MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, > ost->copy_initial_nonkeyframes, oc ,st); Otherwise LGTM. -- regards, Reinhard _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
