September 2015 - ffmpeg-cvslog

avconv: Make the private options discovery more manifest
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Sep 27 16:13:01 2015 +0200| [b5e4f393b6757629281f58c3f3f6d55ca522ab60] | committer: Vittorio Giovara avconv: Make the private options discovery more manifest > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5e4f393b67576292… --- avconv_opt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/avconv_opt.c b/avconv_opt.c index 5bdd7d9..a606606 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -2121,6 +2121,7 @@ void show_help_default(const char *opt, const char *arg) " -h -- print basic options\n" " -h long -- print more options\n" " -h full -- print all options (including all format and codec specific options, very long)\n" + " -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter\n" " See man %s for detailed description of the options.\n" "\n", program_name);

1 0

Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:29:46 2015 +0200| [e490fee6b971f53061d0d21ba0dd79e8a30c7f34] | committer: Hendrik Leppkes Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692' * commit '3973f0f773e0bd212734eccda78aa798f8b20692': Revert "avconv_opt: Allow printing private options" Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e490fee6b971f5306… ---

1 0

Revert "avconv_opt: Allow printing private options"
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Sep 27 16:13:00 2015 +0200| [3973f0f773e0bd212734eccda78aa798f8b20692] | committer: Vittorio Giovara Revert "avconv_opt: Allow printing private options" This reverts commit 7bb1c1bfd22de2200743af04ebd0c7c775f56f7e. A long existing version in the form of avconv -h decoder=h264 already existed, and this just duplicates it. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3973f0f773e0bd212… --- avconv_opt.c | 60 ---------------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/avconv_opt.c b/avconv_opt.c index 3b84135..5bdd7d9 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -2100,63 +2100,6 @@ static int opt_filter_complex_script(void *optctx, const char *opt, const char * return 0; } -/* Search a class from a codec, format, or filter, named 'opt', in order - * to extract its private options. If the class type is specified, only - * the associated options are printed, otherwise all the ones matching - * the input name are shown. */ -static int show_help_specific(const char *opt) -{ - AVCodec *codec = NULL; - AVFilter *filter = NULL; - AVInputFormat *iformat = NULL; - AVOutputFormat *oformat = NULL; - int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM | - AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM; - - char *kind = av_get_token(&opt, ":"); - if (!kind) - return 0; - if (*opt) - opt = &opt[1]; // skip ':' - - show_usage(); - - if (!strcmp(kind, "decoder") && - (codec = avcodec_find_decoder_by_name(opt)) && codec->priv_class) - show_help_children(codec->priv_class, flags); - else if (!strcmp(kind, "encoder") && - (codec = avcodec_find_encoder_by_name(opt)) && codec->priv_class) - show_help_children(codec->priv_class, flags); - else if (!strcmp(kind, "demuxer") && - (iformat = av_find_input_format(opt)) && iformat->priv_class) - show_help_children(iformat->priv_class, flags); - else if (!strcmp(kind, "muxer") && - (oformat = av_guess_format(opt, NULL, NULL)) && oformat->priv_class) - show_help_children(oformat->priv_class, flags); - else if (!strcmp(kind, "filter") && - (filter = avfilter_get_by_name(opt)) && filter->priv_class) - show_help_children(filter->priv_class, flags); - else if (!opt) - av_log(NULL, AV_LOG_ERROR, - "Unknown class '%s', only 'decoder', 'encoder', 'demuxer', " - "'muxer', or 'filter' are valid specifiers.\n", kind); - else { - if ((codec = avcodec_find_decoder_by_name(kind)) && codec->priv_class) - show_help_children(codec->priv_class, flags); - if ((codec = avcodec_find_encoder_by_name(kind)) && codec->priv_class) - show_help_children(codec->priv_class, flags); - if ((iformat = av_find_input_format(kind)) && iformat->priv_class) - show_help_children(iformat->priv_class, flags); - if ((oformat = av_guess_format(kind, NULL, NULL)) && oformat->priv_class) - show_help_children(oformat->priv_class, flags); - if ((filter = avfilter_get_by_name(kind)) && filter->priv_class) - show_help_children(filter->priv_class, flags); - } - av_freep(&kind); - - return codec || iformat || oformat || filter; -} - void show_help_default(const char *opt, const char *arg) { /* per-file options have at least one of those set */ @@ -2168,8 +2111,6 @@ void show_help_default(const char *opt, const char *arg) show_advanced = 1; else if (!strcmp(opt, "full")) show_advanced = show_avoptions = 1; - else if (show_help_specific(opt)) - return; else av_log(NULL, AV_LOG_ERROR, "Unknown help option '%s'.\n", opt); } @@ -2180,7 +2121,6 @@ void show_help_default(const char *opt, const char *arg) " -h -- print basic options\n" " -h long -- print more options\n" " -h full -- print all options (including all format and codec specific options, very long)\n" - " -h [type:]name -- print private options from a codec, format or filter named 'name' (set 'type' to print options from a single class)\n" " See man %s for detailed description of the options.\n" "\n", program_name);

1 0

Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:27:59 2015 +0200| [773570a9dce94922471530d29585e5e87ff64f7a] | committer: Hendrik Leppkes Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f' * commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f': lavc: Simplify checking quant bias option Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=773570a9dce949224… ---

1 0

Merge commit '84dfc426cea7242099aea9d47121cea65dffd936'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:27:42 2015 +0200| [24fea89983756fcd9bfee475581a7b049b3ad8ee] | committer: Hendrik Leppkes Merge commit '84dfc426cea7242099aea9d47121cea65dffd936' * commit '84dfc426cea7242099aea9d47121cea65dffd936': avresample: Remove an unused variable Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24fea89983756fcd9… ---

1 0

lavc: Simplify checking quant bias option
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sat Sep 26 23:00:57 2015 +0200| [cf7d2f2d2134c0854edf2db91e7436ac2bc9874f] | committer: Vittorio Giovara lavc: Simplify checking quant bias option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7d2f2d2134c0854… --- libavcodec/dnxhdenc.c | 3 +-- libavcodec/mpegvideo_enc.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 228ee46..d2fbc16 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -344,8 +344,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) #if FF_API_QUANT_BIAS FF_DISABLE_DEPRECATION_WARNINGS - if (ctx->intra_quant_bias == FF_DEFAULT_QUANT_BIAS && - avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) + if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) ctx->intra_quant_bias = avctx->intra_quant_bias; FF_ENABLE_DEPRECATION_WARNINGS #endif diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c46bcf4..862d07f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -548,11 +548,9 @@ FF_ENABLE_DEPRECATION_WARNINGS #if FF_API_QUANT_BIAS FF_DISABLE_DEPRECATION_WARNINGS - if (s->intra_quant_bias == FF_DEFAULT_QUANT_BIAS && - avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) + if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) s->intra_quant_bias = avctx->intra_quant_bias; - if (s->inter_quant_bias == FF_DEFAULT_QUANT_BIAS && - avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) + if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) s->inter_quant_bias = avctx->inter_quant_bias; FF_ENABLE_DEPRECATION_WARNINGS #endif

1 0

avresample: Remove an unused variable
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sat Sep 26 16:24:02 2015 +0200| [84dfc426cea7242099aea9d47121cea65dffd936] | committer: Vittorio Giovara avresample: Remove an unused variable This fixes a -Wunused-variable warning. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84dfc426cea724209… --- libavresample/resample.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavresample/resample.c b/libavresample/resample.c index 0c94186..7056445 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -234,7 +234,6 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta, int compensation_distance) { ResampleContext *c; - AudioData *fifo_buf = NULL; if (compensation_distance < 0) return AVERROR(EINVAL);

1 0

Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:26:59 2015 +0200| [fe294b34030becfa58001dffaff0311b19e60526] | committer: Hendrik Leppkes Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f' * commit '4885bde3187a2bb0cae85b67796e07db233bf77f': motion_est_template: Fix undefined left shift of negative number Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe294b34030becfa5… ---

1 0

Merge commit '977f41e274a66c9d257186ca1df8373a09cc4d40'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:26:13 2015 +0200| [cbed8dbb7e1e2ac73b93502ee2a56a4e3ee51354] | committer: Hendrik Leppkes Merge commit '977f41e274a66c9d257186ca1df8373a09cc4d40' * commit '977f41e274a66c9d257186ca1df8373a09cc4d40': mlpdec: Fix a undefined left shift of negative number Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbed8dbb7e1e2ac73… ---

1 0

mlpdec: Fix a undefined left shift of negative number
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sat Sep 26 16:24:00 2015 +0200| [977f41e274a66c9d257186ca1df8373a09cc4d40] | committer: Vittorio Giovara mlpdec: Fix a undefined left shift of negative number This fixes a -Wshift-negative-value warning reported with clang 3.7+. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=977f41e274a66c9d2… --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 169437a..8cfeea6 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -578,7 +578,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, /* Default audio coding is 24-bit raw PCM. */ cp->huff_offset = 0; - cp->sign_huff_offset = (-1) << 23; + cp->sign_huff_offset = -(1 << 23); cp->codebook = 0; cp->huff_lsbs = 24; }

1 0