From fbd56159a099dafac617440a2312b47dcb0386c7 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sat, 15 Jan 2011 11:13:07 +0000
Subject: [PATCH] Add docs and Changelog entry for the -copytb option added in
 r26340.

Originally committed as revision 26362 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Changelog       | 1 +
 doc/ffmpeg.texi | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Changelog b/Changelog
index 76f73ffd25..2e99fa4bd6 100644
--- a/Changelog
+++ b/Changelog
@@ -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