summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: use correct index when selecting metadata to write to.Anton Khirnov2011-09-11
| |
| * avconv: fix inverted variableAnton Khirnov2011-09-11
| |
| * avconv: move streamid_map to options context.Anton Khirnov2011-09-11
| |
| * avconv: extend -vf syntaxAnton Khirnov2011-09-11
| | | | | | | | | | Add a per-stream -filter option, make -vf an alias for -filter:v. Move vfilters to the options context.
| * avconv: move top_field_first to options context.Anton Khirnov2011-09-11
| |
| * avconv: move inter/intra matrix to options context.Anton Khirnov2011-09-11
| |
| * avconv: remove -psnr option.Anton Khirnov2011-09-11
| | | | | | | | It's redundant -- -flags +psnr does the same thing.
| * avconv: remove me_threshold option.Anton Khirnov2011-09-11
| | | | | | | | It's only shadowing the AVOption with the same name.
| * avconv: move video_rc_override_string to options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame pixel format to the options context.Anton Khirnov2011-09-11
| | | | | | | | | | | | Also remove redundant -pix_fmt list syntax, it's inconsistent and only makes the code more complicated. -pix_fmts should be enough for everyone.
| * avconv: move frame aspect ratio to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame size to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame_rate to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move force_fps to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move forced_key_frames to the options context.Anton Khirnov2011-09-11
| |
| * avconv: rewrite -qscale and -aq handling.Anton Khirnov2011-09-11
| | | | | | | | | | | | Merge video_qscale (set by -qscale) and audio_qscale (set by -aq) into one 'qscale' field in the options context. Add a shortcut -q for -qscale and make -aq an alias for -q:a.
| * avconv: move audio_sample_rate to the options context.Anton Khirnov2011-09-11
| |
| * cmdutils: add support for programs in check_stream_specifier()Anton Khirnov2011-09-11
| | | | | | | | Remove now redundant (and broken/undocumented) opt_programid.
| * avconv: move audio_sample_fmt to options context.Anton Khirnov2011-09-11
| | | | | | | | | | Also document it and replace undocumented and inconsistent '-sample_fmt list' syntax with -sample_fmts.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. avconv: move audio_channels to the options context. avconv: move *_disable to options context. avconv: remove -[vas]lang options. avconv: move codec tags to options context. cljr: init_get_bits size in bits instead of bytes indeo2: fail if input buffer too small indeo2: init_get_bits size in bits instead of bytes ffv1: Fixed size given to init_get_bits() in decoder. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: move audio_channels to the options context.Anton Khirnov2011-09-10
| |
| * avconv: move *_disable to options context.Anton Khirnov2011-09-10
| |
| * avconv: remove -[vas]lang options.Anton Khirnov2011-09-10
| | | | | | | | They are redundant, the same can be now accomplished with -metadata.
| * avconv: move codec tags to options context.Anton Khirnov2011-09-10
| | | | | | | | Add a new -tag option, make -[vas]tag an alias for -tag:[vas]
* | lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to ↵Stefano Sabatini2011-09-06
| | | | | | | | | | | | | | | | buffersink.h This is done in order to clarify the non-video-specific nature of the buffersink code, as the result of the video/audio API unification of the previous commit, and for improving overall consistency.
* | lavfi: unify asink_buffer and vsink_buffer APIStefano Sabatini2011-09-06
| | | | | | | | | | | | | | | | | | The new API is more generic (no distinction between audio/video for pulling frames), and avoids code duplication. A backward compatibility layer is kept for avoiding tools ABI breaks (only for the video binary interface, audio interface was never used in the tools).
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling() ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled. wavpack: fix wrong return value in wavpack_decode_block() avconv: fix parsing metadata specifiers. fate: use +frame+slice named constants instead of '3' mpeg12: propagate more real return values through chunk decode error return and fix some indentation wavpack: use context reset in appropriate places avconv: move mux_preload and mux_max_delay to options context avconv: move bitstream filters to options context. avconv: move rate_emu to options context. avconv: move max_frames to options context. avconv: move metadata to options context. avconv: move ts scale to options context. avconv: move chapter maps to options context. avconv: move metadata maps to options context. avconv: move codec_names to options context. Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix parsing metadata specifiers.Anton Khirnov2011-09-05
| | | | | | | | | | | | After 039267f192f335144d9251e6f05a1513dd1e8ef1, metadata specifiers are passed without the leading ':'. Remove a ++ that didn't take this into account.
| * avconv: move mux_preload and mux_max_delay to options contextAnton Khirnov2011-09-05
| |
| * avconv: move bitstream filters to options context.Anton Khirnov2011-09-05
| | | | | | | | | | Change syntax -- -[vas]bsf are replaced by -bsf:[stream specifier], the argument is now a comma-separated list of bitstream filters.
| * avconv: move rate_emu to options context.Anton Khirnov2011-09-05
| | | | | | | | Make it work properly with multiple input files.
| * avconv: move max_frames to options context.Anton Khirnov2011-09-05
| | | | | | | | | | Add a -frames option that uses generic stream specifiers, change -[vad]frames into aliases to it.
| * avconv: move metadata to options context.Anton Khirnov2011-09-05
| | | | | | | | It is now possible to set metadata on streams and chapters.
| * avconv: move ts scale to options context.Anton Khirnov2011-09-05
| |
| * avconv: move chapter maps to options context.Anton Khirnov2011-09-05
| |
| * avconv: move metadata maps to options context.Anton Khirnov2011-09-05
| |
| * avconv: move codec_names to options context.Anton Khirnov2011-09-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 format to options contextAnton Khirnov2011-09-04
| |
| * avconv: move limit_filesize to options contextAnton Khirnov2011-09-04
| |
| * avconv: move start_time, recording_time and input_ts_offset to options contextAnton Khirnov2011-09-04
| |
| * avconv: add a context for options.Anton Khirnov2011-09-04
| | | | | | | | | | | | Move stream maps to it. Eventually all non-global options should be stored in it.
| * cmdutils: add support for caller-provided option context.Anton Khirnov2011-09-04
| | | | | | | | This is the first step to removing the globals plague from avtools.
| * cmdutils: move grow_array() from avconv to cmdutils.Anton Khirnov2011-09-04
| |
| * cmdutils: move exit_program() declaration to cmdutils from avconvAnton Khirnov2011-09-04
| | | | | | | | Allows cmdutils to call each tool's own cleanup function.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-03
| | | | | | | | Replace it with newly introduced libavutil API.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-01
|\| | | | | | | | | | | | | | | | | | | * qatar/master: avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 libmp3lame: fix typo AVOptions: drop av_ prefix from static av_get_number(). libx264: use X264_THREADS_AUTO constant instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660Michael Niedermayer2011-09-01
| | | | | | | | | | | | | | | | | | These caused scrambled error messages to be printed and floating point exceptions. For example when there was no decoder available for a stream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 05:48:47 +0000