diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 12:02:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-20 12:02:18 +0200 |
| commit | c5e11e897a9db005e93acffe1673aa8a25d18095 (patch) | |
| tree | 96cceabf77f5e918b175bbaea5acdfc255b91fb1 /ffmpeg.c | |
| parent | ed113d7a6b2d1ff414c1127f955119643e915812 (diff) | |
| parent | db347280eb3746d7b70888db97f1efe5f06f5624 (diff) | |
| download | ffmpeg-c5e11e897a9db005e93acffe1673aa8a25d18095.tar.gz | |
Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'
* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
vorbis: fallback to normal division instead of crashing
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions