summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kang <daniel.d.kang@gmail.com>2011-01-10 11:02:07 +0000
committerPeter Ross <pross@xvid.org>2011-01-10 11:02:07 +0000
commit4da766ce6590554cdc6afd70812a62d5cba43087 (patch)
tree20a2f0cd4ff02055aa4e05d6695c000e1b556ba6
parent2843502ea424a095b39bce7577de90730fb2a0c6 (diff)
perform sanity check on number of channels in electronicarts demuxer
Fixes issue2514 Original patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/electronicarts.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index df517df897..249e5c8175 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -422,6 +422,11 @@ static int ea_read_header(AVFormatContext *s,
st->codec->height = ea->height;
}
+ if (ea->num_channels <= 0) {
+ av_log(s, AV_LOG_WARNING, "Unsupported number of channels: %d\n", ea->num_channels);
+ ea->audio_codec = 0;
+ }
+
if (ea->audio_codec) {
/* initialize the audio decoder stream */
st = av_new_stream(s, 0);