aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Reformat documentation for -vsync @var{parameter}.Stefano Sabatini2011-01-161-10/+19
| | | | | | | Make use of "@table @option" for showing the valid values for the option. Originally committed as revision 26385 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add docs and Changelog entry for the -copytb option added in r26340.Stefano Sabatini2011-01-151-0/+2
| | | | Originally committed as revision 26362 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Match the documentation of -ar with the actual behaviour.Carl Eugen Hoyos2011-01-091-1/+4
| | | | Originally committed as revision 26290 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add demuxers.texi file.Stefano Sabatini2011-01-091-0/+1
| | | | Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Metadata muxerAnton Khirnov2010-12-271-0/+1
| | | | | | Dumps all metadata to a text file for easy manual editing. Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify texi files naming: ff*-doc.texi -> ff*.texi.Stefano Sabatini2010-12-141-0/+968
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk