summaryrefslogtreecommitdiff
path: root/cmdutils_common_opts.h
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils_common_opts: fix indention of #ifMichael Niedermayer2013-04-111-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: add opencl command line options to ffmpeghighgod04012013-04-111-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils_common_opts: fix loglevel help text as its inaccurateMichael Niedermayer2013-03-311-2/+2
| | | | | | | | | ffmpeg and ffplay use the loglevel as well as libpostproc, libswscale and libswresample. Also this makes the text shorter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: implement debug/fdebug log level update differently.Michael Niedermayer2012-12-201-2/+0
| | | | | | | The old implementation is no longer possibly due to limitations of the new command line parser. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "cmdutils: allow specifying the file for -report"Michael Niedermayer2012-11-041-1/+0
| | | | | | This reverts commit 841bf0ef240f0d862b1f07076e079829456fb117. This does not fully work as the file is used before the filename is parsed so not all information is written in the specified file.
* cmdutils: allow specifying the file for -reportMichael Niedermayer2012-11-011-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: add -layouts option.Nicolas George2012-08-281-0/+1
| | | | | | | | | | | | | | | | | | | Extract of the output: | Individual channels: | NAME DESCRIPTION | FL front left | FR front right | <snip> | SDR surround direct right | | Standard channel layouts: | NAME DECOMPOSITION | mono FC | stereo FL+FR | <snip> | octagonal FL+FR+FC+BL+BR+BC+SL+SR | downmix DL+DR
* Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'Michael Niedermayer2012-08-201-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174': avconv: print info/capabilities options in a separate help group. avtools: add -h demuxer/muxer cmdutils: extend -h to allow printing codec details. Conflicts: cmdutils.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: extend -h to allow printing codec details.Anton Khirnov2012-08-191-4/+4
| |
* | Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'Michael Niedermayer2012-08-201-21/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf': avconv: get rid of ugly casts in the options table. avconv: try to match codecs by codec descriptor name as a last resort. avtools: fix show_foo() signatures. Conflicts: cmdutils.c cmdutils.h cmdutils_common_opts.h ffmpeg_opt.c ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avtools: fix show_foo() signatures.Anton Khirnov2012-08-191-16/+16
| | | | | | | | | | show_foo() functions are declared as void show_foo(void), but called as int show_foo(const char*, const char*).
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cmdutils: refactor -codecs option.Anton Khirnov2012-08-181-0/+2
| | | | | | | | | | | | | | Make it print a list of AVCodecDescriptors. Add new -decoders and -encoders options that print lists of decoders and encoders respectively.
* | cmdutils: fix -fdebug without -v xyMichael Niedermayer2012-04-051-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: add -cpuflags.Michael Niedermayer2012-02-191-0/+1
| | | | | | | | | | | | | | This allows globally forcing specific cpuflags (or lack thereof) Useful for debugging and benchmarking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff*: add -max_alloc command line optionMichael Niedermayer2011-12-251-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fftools: add -report option.Nicolas George2011-12-101-0/+1
| |
* | cmdutils: Fix loglevel for -debugMichael Niedermayer2011-10-141-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-101-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header mpeg124: use sign_extend() function ac3dec: use get_sbits() instead of manually sign-extending 4xm: fix signed overflow wmavoice: fix a signed overflow mpegvideo_enc: fix a signed overflow crc: fix signed overflow fate: run avconv with -nostats flag avtools: add -v as alias for -loglevel avconv: always print stats with AV_LOG_INFO doc/avconv: add forgotten output/per-stream info to -filter avconv: add -stats option to enable/disable printing encoding progress avconv: in output_packet() don't set decoded_data_size for video. avconv: remove pointless always true condition avconv: factorize common code in transcode_init() zmbv: remove memcpy() of decoded frame mpeg12enc: use sign_extend() function h264pred: use unsigned types for pixel values, fix signed overflows h264: fix signed overflows in x*0x01010101 expressions h264pred: remove unused variables Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avtools: add -v as alias for -loglevelMans Rullgard2011-10-091-0/+1
| | | | | | | | | | | | This saves a bit of typing. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: move audio_sample_fmt to options context.Anton Khirnov2011-09-111-0/+1
| | | | | | | | | | Also document it and replace undocumented and inconsistent '-sample_fmt list' syntax with -sample_fmts.
| * cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-1/+1
| | | | | | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-06-301-12/+12
| | | | | | | | | | | | | | | | | | which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-1/+1
|/ | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code.
* Implement a -pix_fmts option for listing all the supported pixelStefano Sabatini2009-12-211-0/+1
| | | | | | formats. Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add -?, -help, and --help as alternative options to get help.Ramiro Polla2009-12-211-0/+3
| | | | Originally committed as revision 20906 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement a -filters option, listing all the available libavfilterStefano Sabatini2009-12-121-0/+1
| | | | | | | filters. Currently filters are not registered, so the option will show none. Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize common commandline options definition.Stefano Sabatini2009-11-291-0/+8
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk