Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 15:17:55 +0000 (16:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 15:24:23 +0000 (16:24 +0100)
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/utils.c

Simple merge