aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAgeFilesLines
* doc/ffmpeg.texi: merge changes from avconv.texi since last mergeMichael Niedermayer2011-09-281-11/+16
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/ffmpeg: s/avserver/ffserver/Michael Niedermayer2011-09-131-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge avconv.texi in ffmpeg.texiMichael Niedermayer2011-09-131-198/+203
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-1/+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>
| * doc: cosmetics, rename fftools-common-opts to avtools-....Anton Khirnov2011-09-111-1/+1
| |
| * Rename ffserver to avserver.Anton Khirnov2011-08-091-3/+3
| |
| * Rename ffprobe to avprobe.Anton Khirnov2011-08-091-1/+1
| |
| * Rename ffplay to avplay.Anton Khirnov2011-08-091-1/+1
| |
* | Fix documentation for "-debug" commandline argumentPanagiotis H.M. Issaris2011-09-091-1/+32
| | | | | | | | | | | | (cherry picked from commit 180e7829428e26413916f0cbc2ad85eeb1fb877e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix -loop_input.Carl Eugen Hoyos2011-08-031-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-011-4/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE x11grab: add show_region AVOption. x11grab: add follow_mouse AVOption. Do not convert RGB buffer at once when stride does not fit exact samples. Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Deprecate unused FF_ER_VERY_AGGRESSIVEDustin Brody2011-07-311-2/+0
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * x11grab: add show_region AVOption.Yu-Jie Lin2011-07-311-0/+13
| | | | | | | | | | | | | | Draw the current grabbing region for indication. Signed-off-by: Yu-Jie Lin <livibetter@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * x11grab: add follow_mouse AVOption.Yu-Jie Lin2011-07-311-2/+15
| | | | | | | | | | | | | | | | | | -follow_mouse centered|PIXELS move grabbing region to where mouse pointer at the center; or only move when pointer reaches within PIXELS to the edge. Signed-off-by: Yu-Jie Lin <livibetter@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-291-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding ↵Dustin Brody2011-07-281-0/+2
| | | | | | | | | | | | with sufficient error recognition Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-141-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * ffmpeg: print the low bitrate warning after the codec is openend.Anton Khirnov2011-07-141-4/+0
| | | | | | | | | | | | | | This doesn't access avcodec_opts, so it works with the new options passing system. Makes opt_bitrate() unneeded, so it's removed.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-131-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Improve references to external URLs. h264: move decode_mb_skip() from h264.h to h.264_mvpred.h ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2 dnxhdenc: Replace a forward declaration by the proper #include. h264: move h264_mvpred.h include. pix_fmt: Fix number of bits per component in yuv444p9be lavf: deprecate AVFormatContext.timestamp ffmpeg: merge input_files_ts_scale into InputStream. ffmpeg: don't abuse a global for passing sample format from input to output ffmpeg: don't abuse a global for passing channel layout from input to output ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream() matroskaenc: make SSA default subtitle codec. oggdec: prevent heap corruption. Conflicts: doc/developer.texi doc/faq.texi doc/general.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Improve references to external URLs.Diego Biurrun2011-07-121-2/+2
| | | | | | | | | | | | Sometimes it makes sense to replace a raw URL with some informative text that links to the URL instead of using the raw URL itself in the text. Also transform some mailing list references into links.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-091-5/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: update ffmpeg -ar and -ac documentation to reflect reality.Anton Khirnov2011-07-081-8/+8
| |
| * ffmpeg: deprecate loop_input and loop_output optionsAnton Khirnov2011-07-081-0/+2
| | | | | | | | They were replaced by (de)muxer private options.
| * documentation: extend documentation for ffmpeg -aspect optionStefano Sabatini2011-04-261-1/+7
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix -s documentation.Carl Eugen Hoyos2011-06-181-1/+0
| |
* | Fix documentation for -ar and -ac.Carl Eugen Hoyos2011-06-161-6/+3
| |
* | preset dir for win32Gianluigi Tiesi2011-05-211-0/+1
| |
* | encoders.texi: add documentation for the libx264 encoderStefano Sabatini2011-05-201-7/+0
| | | | | | | | | | Also remove -x264opts item from the ffmpeg manual, since it belongs to the encoders section.
* | doc: add decoders.texi fileStefano Sabatini2011-05-201-0/+1
| |
* | Add little description for -rc_overrideEtienne Buira2011-05-191-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add x264opts entry to docsCompn2011-05-181-0/+7
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-241-17/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Lowercase all ff* program names.Diego Biurrun2011-04-231-3/+3
| |
| * Refer to ff* tools by their lowercase names.Diego Biurrun2011-04-231-14/+12
| |
| * Redefine sameqLou Logan2011-04-101-1/+1
| | | | | | | | | | | | | | | | I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Redefine sameqLou Logan2011-04-051-1/+1
| | | | | | | | | | | | | | I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Match the documentation of -s with the current implementation.Carl Eugen Hoyos2011-04-021-1/+4
| |
* | documentation: extend documentation for ffmpeg -aspect optionStefano Sabatini2011-03-281-1/+7
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-261-0/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add audio_service_type field to AVCodecContext for encoding and reportingJustin Ruggles2011-03-251-0/+22
| | | | | | | | of the service type in the audio bitstream.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-5/+37
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: add details to the documentation for ffmpeg -mapMike Scheutzow2011-03-201-5/+37
| | | | | | | | | | | | Patch by Mike Sheutzow with some additions and changes by Stefano. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Revert "replace FFmpeg with Libav in doc/"Michael Niedermayer2011-03-171-3/+3
|/ | | | | | | | This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt
* replace FFmpeg with Libav in doc/Janne Grunau2011-03-161-3/+3
| | | | unless it stands for ffmpeg the program or is historic
* documentation: add encoders chapterJames Zern2011-02-171-0/+1
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* ffmpeg.c: rename map_meta_data option to map_metadataAnton Khirnov2011-02-021-2/+5
| | | | | | It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* doc: modify style for texi2html 1.78+Janne Grunau2011-01-291-2/+4
| | | | | | | | | | | | The generated HTML files are similar to the ones generated with texi2html 1.56k used on the website. Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended version. The removed @sp from the titlepage section were ignored until texi2html 5.0. If not removed the pages generated by 5.0 will have ugly empty space around the title.
* Add muxers.texi file.Stefano Sabatini2011-01-281-0/+1
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* streamid does not work with newaudio, newvideo, newsubtitleMike Scheutzow2011-01-221-2/+4
| | | | | | | | | | | | | | | | | | fixes issue2465. The problem is that the ffmpeg (the app) -streamid option did not work with -newaudio/-newvideo/-newsubtitle. The cause was a conflict between the feature where streamid values were reset to default for each output filename, and the implementation of -new*, which requires that the -new* option be specified after the target filename. My patch changes the ffmpeg behavior so that user-specified streamid values apply to all the following output files on the command line (rather than just the next output filename.) Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* In ffmpeg.texi, prefer @itemize lists over text formatted "*" lists.Stefano Sabatini2011-01-161-14/+30
| | | | Originally committed as revision 26387 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 16:57:06 +0000