Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:12:21 +0000 (15:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:14:31 +0000 (15:14 +0200)
* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
  r3d: Add more input value validation

Conflicts:
libavformat/r3d.c

See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8
See: df92ac18528bac4566fc4f5ba4d607c1265791ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/r3d.c

@@@ -85,10 -85,7 +85,10 @@@ static int r3d_read_red1(AVFormatContex
  
      framerate.num = avio_rb16(s->pb);
      framerate.den = avio_rb16(s->pb);
-     if (framerate.num && framerate.den) {
+     if (framerate.num > 0 && framerate.den > 0) {
 +#if FF_API_R_FRAME_RATE
 +        st->r_frame_rate =
 +#endif
          st->avg_frame_rate = framerate;
      }