From 8562d9bd6c20d2ecee4f25d582cfd917f9da0d28 Mon Sep 17 00:00:00 2001
From: John Brooks <john.brooks@bluecherry.net>
Date: Thu, 8 Dec 2011 09:16:21 +0000
Subject: [PATCH] shorten: avoid abort() on unknown audio types
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
---
libavcodec/shorten.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 2170d591dd1..eb67df7bea1 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -176,7 +176,7 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer)
}
-static void init_offset(ShortenContext *s)
+static int init_offset(ShortenContext *s)
{
int32_t mean = 0;
int chan, i;
@@ -190,12 +190,13 @@ static void init_offset(ShortenContext *s)
break;
default:
av_log(s->avctx, AV_LOG_ERROR, "unknown audio type");
- abort();
+ return AVERROR_INVALIDDATA;
}
for (chan = 0; chan < s->channels; chan++)
for (i = 0; i < nblock; i++)
s->offset[chan][i] = mean;
+ return 0;
}
static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header,
@@ -367,7 +368,8 @@ static int read_header(ShortenContext *s)
if ((ret = allocate_buffers(s)) < 0)
return ret;
- init_offset(s);
+ if ((ret = init_offset(s)) < 0)
+ return ret;
if (s->version > 1)
s->lpcqoffset = V2LPCQOFFSET;
--
GitLab