diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 02:58:40 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 02:59:09 +0400 |
| commit | f2387152bcdc4b3a4e650f8b00600796aa0504de (patch) | |
| tree | 08ab3c858d056e314f253283ca5fd679a59c8a55 /libavcodec | |
| parent | 9026c49c82dce0a7658e7cd116f98fdd020d2bed (diff) | |
| parent | 5c79d2e12d13959fc6aed92d102c25194a06de05 (diff) | |
Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'
* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
avconv: Do not divide by zero
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions