Commit 17049bff authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'adc09136'

* commit 'adc09136':
  xwma: Avoid division by zero

Conflicts:
	libavformat/xwma.c

See: a3cb7f99Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3a3ebc7c adc09136
...@@ -199,8 +199,10 @@ static int xwma_read_header(AVFormatContext *s) ...@@ -199,8 +199,10 @@ static int xwma_read_header(AVFormatContext *s)
/* Estimate the duration from the total number of output bytes. */ /* Estimate the duration from the total number of output bytes. */
const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1]; const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1];
if(!bytes_per_sample) { if (!bytes_per_sample) {
av_log(s, AV_LOG_ERROR, "bytes_per_sample is 0\n"); 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; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment