diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
commit | 1889c6724a449b2e4826612d3b72efc76dbfb713 (patch) | |
tree | 05abce06cd1151955b1f1280721044584012ee51 /ffprobe.c | |
parent | ca4d71b149ebe32aeaf617ffccf362624b9aafb1 (diff) | |
parent | e955a682e125d44143415ff2b96a99a4dac78da2 (diff) | |
download | ffmpeg-1889c6724a449b2e4826612d3b72efc76dbfb713.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
AVOptions: fix av_set_string3() doxy to match reality.
cmdutils: get rid of dummy contexts for examining AVOptions.
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
cpu detection: avoid a signed overflow
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
-rw-r--r-- | ffprobe.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -470,11 +470,12 @@ static int opt_input_file(const char *opt, const char *arg) static int opt_help(const char *opt, const char *arg) { + const AVClass *class = avformat_get_class(); av_log_set_callback(log_callback_help); show_usage(); show_help_options(options, "Main options:\n", 0, 0); printf("\n"); - av_opt_show2(avformat_opts, NULL, + av_opt_show2(&class, NULL, AV_OPT_FLAG_DECODING_PARAM, 0); return 0; } @@ -529,7 +530,5 @@ int main(int argc, char **argv) ret = probe_file(input_filename); - av_free(avformat_opts); - return ret; } |