Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
	libavformat/utils.c

See: a5d67bc7Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/utils.c

@@ -2220,15 +2220,18 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
 
     /* if bit_rate is already set, we believe it */
     if (ic->bit_rate <= 0) {
-        int64_t bit_rate = 0;
+        int bit_rate = 0;
         for(i=0;i<ic->nb_streams;i++) {
             st = ic->streams[i];
             if (st->codec->bit_rate > 0) {
+                if (INT_MAX - st->codec->bit_rate < bit_rate) {
+                    bit_rate = 0;
+                    break;
+                }
                 bit_rate += st->codec->bit_rate;
             }
         }
-        if (bit_rate <= INT_MAX)
-            ic->bit_rate = bit_rate;
+        ic->bit_rate = bit_rate;
     }
 
     /* if duration is already set, we believe it */