Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:58:22 +0000 (14:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:58:28 +0000 (14:58 +0100)
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
  lavf: include 60 fps in guessed standard frame rates

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

Simple merge