Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'

* commit 'a9221e39600a31ee13e736e9e47743cde23f0280':
  electronicarts: Add more sanity checking for the number of channels

Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-29 23:45:56 +02:00
commit 7057cc861d

View File

@ -485,7 +485,7 @@ static int ea_read_header(AVFormatContext *s)
}
if (ea->audio_codec) {
if (ea->num_channels <= 0) {
if (ea->num_channels <= 0 || ea->num_channels > 2) {
av_log(s, AV_LOG_WARNING,
"Unsupported number of channels: %d\n", ea->num_channels);
ea->audio_codec = 0;