aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs
diff options
context:
space:
mode:
authorGravatar uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-01 06:51:53 +0000
committerGravatar uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-01 06:51:53 +0000
commit3e8ab8664210815887ac2d77af708d1a237602aa (patch)
treed3857e311fd73658661ea9acc20511a5602fdb2e /libmpcodecs
parent9e796deb33bfacec19ad895fd4aca56dab3b0b51 (diff)
Replace hopefully unreachable code with abort()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24914 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/dec_audio.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index d0fa3b3fd1..5445eeac22 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -388,13 +388,8 @@ int decode_audio(sh_audio_t *sh_audio, unsigned char *buf, int minlen,
af_data_t *pafd; // filter output
ad_functions_t *mpadec = sh_audio->ad_driver;
- if (!sh_audio->inited)
- return -1; // no codec
- if (!sh_audio->afilter) {
- // no filter, just decode:
- // FIXME: don't drop initial decoded data in a_buffer!
- return mpadec->decode_audio(sh_audio, buf, minlen, maxlen);
- }
+ if (!sh_audio->inited || !sh_audio->afilter)
+ abort();
declen = af_calc_insize_constrained(sh_audio->afilter, minlen, maxlen,
sh_audio->a_buffer_size -