diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-15 11:13:07 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-15 11:13:07 +0000 |
commit | fbd56159a099dafac617440a2312b47dcb0386c7 (patch) | |
tree | 5c13c07e699962608dad03963885410f58c99465 | |
parent | f93fe7764ba054b92d33333f604cfc87767669a0 (diff) | |
download | ffmpeg-fbd56159a099dafac617440a2312b47dcb0386c7.tar.gz |
Add docs and Changelog entry for the -copytb option added in r26340.
Originally committed as revision 26362 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | Changelog | 1 | ||||
-rw-r--r-- | doc/ffmpeg.texi | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -72,6 +72,7 @@ version <next>: - SubRip (srt) subtitle decoder - floating-point AC-3 encoder added - Lagarith decoder +- ffmpeg -copytb option added version 0.6: diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ac3d564ff6..9eb885b166 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -687,6 +687,8 @@ the parameter is the maximum samples per second by which the audio is changed. without any later correction. @item -copyts Copy timestamps from input to output. +@item -copytb +Copy input stream time base from input to output when stream copying. @item -shortest Finish encoding when the shortest input stream ends. @item -dts_delta_threshold |