aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-03-24 11:11:25 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-03-24 11:11:25 +0000
commitd692850bbbdf5be48bd91c2c540e83496582b9b1 (patch)
tree5f46772c1f61b8c7f35c86650af39291eea7676f
parentc6a5e087cf619775c18386c48711b7aa5efe059e (diff)
downloadffmpeg-d692850bbbdf5be48bd91c2c540e83496582b9b1.tar.gz
Silence ridiculous gcc warning.
Originally committed as revision 22654 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 5204e903c6..2b17154539 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -909,7 +909,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
}
// start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming
- if (url_is_streamed(s->pb) && (url_ftell(pb) > 32*1024 || ts > mkv->cluster_pts + 1000)
+ if ((url_is_streamed(s->pb) && (url_ftell(pb) > 32*1024 || ts > mkv->cluster_pts + 1000))
|| url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || ts > mkv->cluster_pts + 5000) {
av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
" bytes, pts %" PRIu64 "\n", url_ftell(pb), ts);