diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-29 22:59:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-29 22:59:49 +0200 |
| commit | 17049bff64f27e67e9742193a8e033abf8d1d009 (patch) | |
| tree | 4a49d7707b75c61af1f265c971767561a2866c78 /libavcodec/webp.c | |
| parent | 3a3ebc7c7dcc650c917bd36cadff09f1016f964c (diff) | |
| parent | adc09136a4a63b152630abeacb22c56541eacf60 (diff) | |
| download | ffmpeg-17049bff64f27e67e9742193a8e033abf8d1d009.tar.gz | |
Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'
* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
xwma: Avoid division by zero
Conflicts:
libavformat/xwma.c
See: a3cb7f992f88fcfa524bd9cd08b28e09d6718f75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webp.c')
0 files changed, 0 insertions, 0 deletions