OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 22:39:33 +0000 (00:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 22:55:07 +0000 (00:55 +0200)
commit4f1d3e02122e1896c2d946ae8c32b8b3f767aa19
tree25df00e6d0286a2f2a0ccdad4c55e2e701ed1685
parent13eed267f8c140ca3d69a7a716b917ec7dd77d97
parente740929a071ab032ffa382e89da69c6ec7cf882c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Make sure avg_frame_rate can be calculated without integer overflow

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