diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:59:11 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:59:49 +0400 |
| commit | 17049bff64f27e67e9742193a8e033abf8d1d009 (patch) | |
| tree | 4a49d7707b75c61af1f265c971767561a2866c78 /libavformat/xwma.c | |
| parent | 3a3ebc7c7dcc650c917bd36cadff09f1016f964c (diff) | |
| parent | adc09136a4a63b152630abeacb22c56541eacf60 (diff) | |
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 'libavformat/xwma.c')
| -rw-r--r-- | libavformat/xwma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 0d40bd76c8..135faf2f7a 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -199,8 +199,10 @@ static int xwma_read_header(AVFormatContext *s) /* Estimate the duration from the total number of output bytes. */ const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1]; - if(!bytes_per_sample) { - av_log(s, AV_LOG_ERROR, "bytes_per_sample is 0\n"); + if (!bytes_per_sample) { + av_log(s, AV_LOG_ERROR, + "Invalid bits_per_coded_sample %d for %d channels\n", + st->codec->bits_per_coded_sample, st->codec->channels); return AVERROR_INVALIDDATA; } |