aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-55/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: move start_time, recording_time and input_ts_offset to options contextAnton Khirnov2011-09-041-0/+2
| |
| * cmdutils: allow storing per-stream/chapter/.... options in a generic wayAnton Khirnov2011-09-041-1/+12
| |
| * cmdutils: split per-option code out of parse_options().Anton Khirnov2011-09-041-52/+60
| | | | | | | | | | This allows options like -target, which are just shortcuts for other options, to work without dummy function for all options they invoke.
| * cmdutils: add support for caller-provided option context.Anton Khirnov2011-09-041-5/+9
| | | | | | | | This is the first step to removing the globals plague from avtools.
| * cmdutils: declare only one pointer type in OptionDefAnton Khirnov2011-09-041-5/+7
| | | | | | | | This will be useful in the following commit.
| * cmdutils: move grow_array() from avconv to cmdutils.Anton Khirnov2011-09-041-0/+19
| |
| * cmdutils: move exit_program() declaration to cmdutils from avconvAnton Khirnov2011-09-041-7/+8
| | | | | | | | Allows cmdutils to call each tool's own cleanup function.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-041-18/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cmdutils: get rid of dummy contexts for examining AVOptions.Anton Khirnov2011-09-031-18/+9
| | | | | | | | Replace it with newly introduced libavutil API.
* | cmdutils: revert avconv rename of pathesMichael Niedermayer2011-09-031-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix uninitialized variable (type) warning.Clément Bœsch2011-09-011-0/+1
| |
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-131-10/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: allow precisely specifying a stream for AVOptions.Anton Khirnov2011-08-121-5/+55
| |
| * cmdutils: allow ':'-separated modifiers in option names.Anton Khirnov2011-08-121-1/+4
| |
| * Make a copy of ffmpeg under a new name -- avconv.Anton Khirnov2011-08-121-4/+4
| | | | | | | | | | | | | | It will be further developed with a few incompatible changes. ffmpeg.c will stay as is for some time, so any scripts using it won't be broken.
* | options: handle options with the same name in codecs and formats.Clément Bœsch2011-08-101-9/+9
| | | | | | | | | | This will allow the incoming -timecode option to be handled in both encoders (mpeg12enc in that case) and demuxers (dv, mxf, etc.).
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition x86: cabac: don't load/store context values in asm H.264: optimize CABAC x86 asm for Atom vp3/theora: flush after seek. doc/fftools-common-opts: wording fixes missing from the previous commit. doc: document using AVOptions in fftools. cmdutils: add codec_opts parameter to setup_find_stream_info_opts() cmdutils: clarify documentation for filter_codec_opts() cmdutils: clarify documentation for setup_find_stream_info_opts() lavf: add forgotten attribute_deprecated to av_find_stream_info() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add codec_opts parameter to setup_find_stream_info_opts()Stefano Sabatini2011-07-281-1/+1
| | | | | | | | | | | | Avoid brittle and obfuscating reference to a global. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | cmdutils: remove #if 0-ed conflict marger trash that i forgotMichael Niedermayer2011-07-141-140/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-141-86/+119
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: replace opt_default with opt_default2() and remove set_context_optsAnton Khirnov2011-07-131-107/+1
| |
| * ffplay: use new avcodec_open2 and avformat_find_stream_info API.Anton Khirnov2011-07-131-0/+17
| |
| * cmdutils: store all codec options in one dict instead of video/audio/subAnton Khirnov2011-07-131-21/+34
| | | | | | | | Split them when codec id is known.
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make avcodec_alloc_context3 officially public.Anton Khirnov2011-07-101-1/+1
| | | | | | | | Deprecate avcodec_alloc_context/2.
* | cmdutils: fix an opt name/val swap in set_context_opts()Etienne Buira2011-07-021-1/+1
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-06-301-8/+16
| | | | | | | | | | | | | | | | | | 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_
* | parse_options(): Avoid passing NULL as a string arg to fprintfJeff Downs2011-06-241-1/+1
| |
* | cmdutils: remove outcommented merge trashMichael Niedermayer2011-06-201-36/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add vsink_buffer, and use it in ff* toolsStefano Sabatini2011-06-191-68/+0
| | | | | | | | Also add the public interface libavfilter/vsink_buffer.h.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-181-1/+83
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add opt_default2().Anton Khirnov2011-06-161-4/+46
| | | | | | | | | | | | It stores options in a dictionary to be passed to new open calls. It will replace opt_default once all the pieces are in place.
| * AVOptions: add av_opt_find() as a replacement for av_find_opt.Anton Khirnov2011-06-161-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-131-1/+1
|\| | | | | | | | | | | | | | | * qatar/master: cmdutils: add missing NULL check in parse_options() x11grab: remove a memory allocation and the associated memcpy. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add missing NULL check in parse_options()Stefano Sabatini2011-06-121-1/+1
| | | | | | | | | | | | Fix ffplay -i FILE, which was recently broken. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: add missing const qualifierMans Rullgard2011-06-041-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-4/+2
| | | | | | | | | | | | | | | | | | 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>
* | cmdutils: remove unnecessary OPT_DUMMY implementationStefano Sabatini2011-06-051-2/+0
| | | | | | | | | | | | The -i INPUT option can be implemented more cleanly by using a function option, which can easily be done now that the parse_arg_function passed to parse_options has a standard signature.
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-051-3/+5
| | | | | | | | This is required for a pending simplification.
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-6/+4
| | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-271-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) ARM: disable ff_vector_fmul_vfp on VFPv3 systems ARM: check for VFPv3 swscale: Remove unused variables in x86 code. doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. x86: Add appropriate ifdefs around certain AVX functions. cmdutils: use sws_freeContext() instead of av_freep(). swscale: delay allocation of formatConvBuffer(). swscale: fix build with --disable-swscale-alpha. movenc: Deprecate the global RTP hinting flag, use a private AVOption instead movenc: Add an AVClass for setting muxer specific options swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. configure: report yasm/nasm presence properly tcp: make connect() timeout properly rawdec: factor video demuxer definitions into a macro. rtspdec: add initial_pause private option. lavf: deprecate AVFormatParameters.width/height. tty: add video_size private option. rawdec: add video_size private option. x11grab: add video_size private option. x11grab: factorize returning error codes. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: use sws_freeContext() instead of av_freep().Ronald S. Bultje2011-05-271-1/+2
| | | | | | | | | | av_freep(swsContext) will leak all memory potentially allocated within the swsContext.
| * ffplay: add a dummy option -i so that it is easy to switch between ffmpeg -i ↵Benjamin Larsson2011-05-111-2/+2
| | | | | | | | | | | | "file" and ffplay -i "file". Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: add OPT_INT check in parse_number_or_die()Stefano Sabatini2011-05-101-0/+2
| | | | | | | | | | | | | | Check that the value passed for an OPT_INT option is an int, fail otherwise. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: remove list_fmts(), simplifyStefano Sabatini2011-05-101-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The function was only used in opt_sample_fmt() for listing the sample formats. Move list_fmts() functionality directly into opt_sample_fmt(). Also fix the warning: ffmpeg.c: In function ‘opt_audio_sample_fmt’: ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’ Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | preset dir for win32Gianluigi Tiesi2011-05-211-0/+17
| |
* | cmdutils: use const AVClass * when sensefulStefano Sabatini2011-05-201-3/+4
| | | | | | | | | | | | | | | | | | Fix warnings: cmdutils.c: In function ‘opt_default’: cmdutils.c:304: warning: initialization discards qualifiers from pointer target type cmdutils.c: In function ‘set_context_opts’: cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’
* | cmdutils: reset *picref_ptr to NULL in get_filtered_frame()Stefano Sabatini2011-05-201-0/+1
| | | | | | | | | | Avoid the presence of an invalid pointer, fix a crash in case of get_filtered_frame() failure.
* | cmdutils: Allocate private decoder context if its not allocated yet.Michael Niedermayer2011-05-161-1/+12
| | | | | | | | | | This fixes and simplifies setting decoder private options. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 14:02:01 +0000