6c180b35c4
* qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
23 lines
1.7 KiB
C
23 lines
1.7 KiB
C
{ "L", OPT_EXIT, {(void*)opt_license}, "show license" },
|
|
{ "h", OPT_EXIT, {(void*)opt_help}, "show help" },
|
|
{ "?", OPT_EXIT, {(void*)opt_help}, "show help" },
|
|
{ "help", OPT_EXIT, {(void*)opt_help}, "show help" },
|
|
{ "-help", OPT_EXIT, {(void*)opt_help}, "show help" },
|
|
{ "version", OPT_EXIT, {(void*)opt_version}, "show version" },
|
|
{ "formats" , OPT_EXIT, {(void*)opt_formats }, "show available formats" },
|
|
{ "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" },
|
|
{ "decoders" , OPT_EXIT, {(void*)show_decoders }, "show available decoders" },
|
|
{ "encoders" , OPT_EXIT, {(void*)show_encoders }, "show available encoders" },
|
|
{ "bsfs" , OPT_EXIT, {(void*)opt_bsfs }, "show available bit stream filters" },
|
|
{ "protocols", OPT_EXIT, {(void*)opt_protocols}, "show available protocols" },
|
|
{ "filters", OPT_EXIT, {(void*)opt_filters }, "show available filters" },
|
|
{ "pix_fmts" , OPT_EXIT, {(void*)opt_pix_fmts }, "show available pixel formats" },
|
|
{ "sample_fmts", OPT_EXIT, {.func_arg = show_sample_fmts }, "show available audio sample formats" },
|
|
{ "loglevel", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
|
|
{ "v", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
|
|
{ "debug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" },
|
|
{ "fdebug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" },
|
|
{ "report", 0, {(void*)opt_report}, "generate a report" },
|
|
{ "max_alloc", HAS_ARG, {(void*)opt_max_alloc}, "set maximum size of a single allocated block", "bytes" },
|
|
{ "cpuflags", HAS_ARG | OPT_EXPERT, {(void*)opt_cpuflags}, "force specific cpu flags", "flags" },
|