diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:58:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 14:58:28 +0100 |
| commit | e53ec2fe3829af4a76b61cd369d8a80da74b93ff (patch) | |
| tree | deb074ea989cfa23cdc436059dd7dce32dfdb506 /libavformat/avs.c | |
| parent | dd4237f87d84ad2ea9749dc9b2e724acaa04d16d (diff) | |
| parent | 78987a88a88b28d93d03ed6c228bcb33f178444f (diff) | |
| download | ffmpeg-e53ec2fe3829af4a76b61cd369d8a80da74b93ff.tar.gz | |
Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avs.c')
0 files changed, 0 insertions, 0 deletions