aboutsummaryrefslogtreecommitdiffstats
path: root/doc/avconv.texi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-041-0/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vp6: Fix illegal read. avfilter: Don't copy garbage from the stack when setting up video pictures. avcodec: Make sure codec_type is set by avcodec_get_context_defaults2 avcodec: Remove a misplaced and useless attribute_deprecated avconv: add -dump_attachment option. avconv: add -attach option. avconv: make negative mappings disable only streams from the specified file fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64 Conflicts: libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add -dump_attachment option.Anton Khirnov2011-11-031-0/+18
| |
| * avconv: add -attach option.Anton Khirnov2011-11-031-0/+15
| | | | | | | | It allows attaching arbitrary files, e.g. fonts to Matroska files.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * presets: rename presets directoryJanne Grunau2011-10-191-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-181-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add presets rtsp: Expose the flag options via private AVOptions for sdp and rtp, too rtsp: Make the rtsp flags avoptions set via a define rtpenc: Set a default video codec avoptions: Fix av_opt_flag_is_set rtp: Fix ff_rtp_get_payload_type doc: Update the documentation on setting options for RTSP rtsp: Remove the separate filter_source variable rtsp: Accept options via private avoptions instead of URL options rtsp: Simplify AVOption definitions rtsp: Merge the AVOption lists lavfi: port libmpcodecs delogo filter lavfi: port boxblur filter from libmpcodecs lavfi: add negate filter lavfi: add LUT (LookUp Table) generic filters AVOptions: don't segfault on NULL parameter in av_set_options_string() avio: Check for invalid buffer length. mpegenc/mpegtsenc: add muxrate private options. lavf: deprecate AVFormatContext.file_size mov: add support for TV metadata atoms tves, tvsn and stik Conflicts: Changelog doc/filters.texi doc/protocols.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/internal.h libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_lut.c libavformat/mpegtsenc.c libavformat/utils.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add presetsAlexandra Khirnova2011-10-171-0/+17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-101-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-4/+0
| | | | | | | | | | | | This saves a bit of typing. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * doc/avconv: add forgotten output/per-stream info to -filterAnton Khirnov2011-10-091-1/+1
| |
| * avconv: add -stats option to enable/disable printing encoding progressAnton Khirnov2011-10-091-0/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-281-10/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: use different variables for decoded and filtered frame. avconv: add support for copying attachments. matroskaenc: write attachments. matroskadec: export mimetype of attachments as metadata. avconv: factorize common code from new_*_stream() doc/avconv: expand documentation for some options. doc/avconv: document -timelimit. Conflicts: avconv.c cmdutils.c tests/codec-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc/avconv: expand documentation for some options.Anton Khirnov2011-09-271-10/+12
| |
| * doc/avconv: document -timelimit.Anton Khirnov2011-09-271-0/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-271-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: replace all fprintf() by av_log().Anton Khirnov2011-09-261-1/+2
| | | | | | | | Deprecate -v option, now only -loglevel is enough.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: split ADPCM encoders and decoders into separate files. doc/avconv: fix typo. rv34: check that subsequent slices have the same type as first one. smacker demuxer: handle possible av_realloc() failure. lavfi: add split filter from soc. lavfi: add showinfo filter libxavs: add private options corresponding to deprecated global options Conflicts: Changelog libavcodec/adpcm.c libavfilter/avfilter.h libavfilter/vf_showinfo.c libavfilter/vf_split.c libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc/avconv: fix typo.Anton Khirnov2011-09-121-1/+1
| |
* | doc: replace avserver by ffserver as we have not done that renameMichael Niedermayer2011-09-121-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-158/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * doc/avconv: document option types (input/output/per-stream/...)Anton Khirnov2011-09-111-73/+56
| | | | | | | | Also trim some redundant stream specifiers descriptions.
| * doc/avconv: remove two pointless paragraphs.Anton Khirnov2011-09-111-9/+0
| | | | | | | | They are misleading and carry no useful information.
| * doc/avconv: document that global options should be specified first.Anton Khirnov2011-09-111-1/+3
| |
| * doc/avconv: remove entries for nonexistent optionsAnton Khirnov2011-09-111-58/+0
| |
| * doc/avconv: remove documentation for removed 'timestamp' optionAnton Khirnov2011-09-111-12/+0
| |
| * doc: cosmetics, rename fftools-common-opts to avtools-....Anton Khirnov2011-09-111-1/+1
| |
| * avconv: extend -vf syntaxAnton Khirnov2011-09-111-1/+6
| | | | | | | | | | Add a per-stream -filter option, make -vf an alias for -filter:v. Move vfilters to the options context.
| * avconv: remove -psnr option.Anton Khirnov2011-09-111-2/+0
| | | | | | | | It's redundant -- -flags +psnr does the same thing.
| * avconv: move frame pixel format to the options context.Anton Khirnov2011-09-111-1/+1
| | | | | | | | | | | | 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: rewrite -qscale and -aq handling.Anton Khirnov2011-09-111-3/+6
| | | | | | | | | | | | 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_fmt to options context.Anton Khirnov2011-09-111-0/+3
| | | | | | | | | | Also document it and replace undocumented and inconsistent '-sample_fmt list' syntax with -sample_fmts.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-101-12/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: remove -[vas]lang options.Anton Khirnov2011-09-101-10/+0
| | | | | | | | They are redundant, the same can be now accomplished with -metadata.
| * avconv: move codec tags to options context.Anton Khirnov2011-09-101-2/+5
| | | | | | | | Add a new -tag option, make -[vas]tag an alias for -tag:[vas]
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-16/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: move bitstream filters to options context.Anton Khirnov2011-09-051-12/+11
| | | | | | | | | | Change syntax -- -[vas]bsf are replaced by -bsf:[stream specifier], the argument is now a comma-separated list of bitstream filters.
| * avconv: move max_frames to options context.Anton Khirnov2011-09-051-3/+6
| | | | | | | | | | 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-051-1/+13
| | | | | | | | It is now possible to set metadata on streams and chapters.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-291-14/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "h264: Properly set coded_{width, height} when parsing H.264." isom: add missing AVC-Intra tags, rearrange list and update comments avconv: remove stubs of crop* and pad* options avconv: re-add nb_streams to InputFile. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove stubs of crop* and pad* optionsAnton Khirnov2011-08-291-14/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-201-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/avconv: replace forgotten av by avconv. avconv: reset input_ts_offset between files. doc/avconv: extend -ss documentation. avconv: call flush_encoders() from transcode() directly. avconv: fix broken indentation. avconv: rescue poor abused limit_filesize global. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc/avconv: replace forgotten av by avconv.Anton Khirnov2011-08-191-2/+2
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: reset input_ts_offset between files.Anton Khirnov2011-08-191-1/+0
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * doc/avconv: extend -ss documentation.Anton Khirnov2011-08-191-2/+6
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-191-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Fix spelling errors. aac: Only set sample rate and object type from ADTS if output hasn't been configured. aac: Set SBR and PS to unsignalled during headerless and ADTS initialization. aac: Only output configure if audio was found. avconv: save two levels of indentation in flush_encoders() avconv: factor flushing encoders out of output_packet(). avconv: factor out initializing input streams. avconv: remove -intra option. avconv: reset streamid_map between output files. avconv: make timer_start a local var in transcode(). avconv: cosmetics, move OutputStream. avconv: remove two unused macros. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove -intra option.Anton Khirnov2011-08-181-2/+0
| | | | | | | | It's equivalent to -g 0.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-161-56/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings avconv: remove a write-only variable avconv: remove pointless parameter from new_*_stream(). avconv: cosmetics, move code avconv: cosmetics -- move copy_chapters(). avconv: cosmetics -- move parse_forced_key_frames(). lavc: add audio flag to the 'b' option, deprecate 'ab'. avconv: rename sameq to same_quant doc/avconv: add forgotten end of chapter. Changelog: document avconv incompatibilities with ffmpeg. avconv: replace -vcodec/-acodec/-scodec with a better system. avconv: remove presets. svq3: propagate codec memory allocation failure in context init Conflicts: Changelog avconv.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add audio flag to the 'b' option, deprecate 'ab'.Anton Khirnov2011-08-161-2/+2
| | | | | | | | | | | | Its only reason for its existence was ffmpeg's inability to properly assign AVOptions to streams. Now this is not a problem anymore, so 'ab' should go.
| * avconv: rename sameq to same_quantAnton Khirnov2011-08-161-6/+4
| | | | | | | | | | It's often mistakenly used as 'same quality', emphasize that it's not true in the manual.
| * doc/avconv: add forgotten end of chapter.Anton Khirnov2011-08-161-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 16:26:29 +0000