[FFmpeg-cvslog] avformat/mux: simplify ff_choose_timebase()

Michael Niedermayer git at videolan.org
Wed Jun 18 20:16:15 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 20:09:55 2014 +0200| [1d54f5108477938268d51162be536cecd746e56a] | committer: Michael Niedermayer

avformat/mux: simplify ff_choose_timebase()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d54f5108477938268d51162be536cecd746e56a
---

 libavformat/mux.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index f542c9e..afdeca1 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -107,11 +107,8 @@ AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precisio
     AVRational q;
     int j;
 
-    if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-        q = (AVRational){1, st->codec->sample_rate};
-    } else {
-        q = st->codec->time_base;
-    }
+    q = st->time_base;
+
     for (j=2; j<14; j+= 1+(j>2))
         while (q.den / q.num < min_precision && q.num % j == 0)
             q.num /= j;



More information about the ffmpeg-cvslog mailing list