aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-24 02:19:46 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-24 02:19:46 +0000
commit1692008f518eb5ffc678483ea178518d45a0e1ae (patch)
tree5a5ded12179a84aa4f82b65139b391f857a3612d /ffserver.c
parent5366f15d05ea2d8f1a052db5546d51c0a165df90 (diff)
downloadffmpeg-1692008f518eb5ffc678483ea178518d45a0e1ae.tar.gz
latest libavc svn requires at least this value for bit_rate_tolerance, not using av_q2d because of float
Originally committed as revision 13271 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 986bd694ab..a32e11aa00 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3584,7 +3584,8 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
}
/* Bitrate tolerance is less for streaming */
if (av->bit_rate_tolerance == 0)
- av->bit_rate_tolerance = av->bit_rate / 4;
+ av->bit_rate_tolerance = FFMAX(av->bit_rate / 4,
+ (int64_t)av->bit_rate*av->time_base.num/av->time_base.den);
if (av->qmin == 0)
av->qmin = 3;
if (av->qmax == 0)