diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-07-10 16:10:14 +0200 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-07-10 16:10:14 +0200 |
commit | a3b0ae22d76522d0a79f5d946872c0260dd1e3b2 (patch) | |
tree | 0e5f09d29bdfb33bab596bde5f08ecce19675f33 | |
parent | 0e1d6c0011928673e2331671539fb0b7b1194ca7 (diff) |
avdec: ignore AAC errors instead of erroring out
Also ignore decode errors for AAC and carry on decoding like we do for all
other formats.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=679639
-rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 1604e68..c9c8281 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -742,15 +742,6 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec, *outbuf = NULL; } - /* If we don't error out after the first failed read with the AAC decoder, - * we must *not* carry on pushing data, else we'll cause segfaults... */ - if (len == -1 && (in_plugin->id == CODEC_ID_AAC - || in_plugin->id == CODEC_ID_AAC_LATM)) { - GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, (NULL), - ("Decoding of AAC stream by libav failed.")); - *ret = GST_FLOW_ERROR; - } - beach: GST_DEBUG_OBJECT (ffmpegdec, "return flow %d, out %p, len %d", *ret, *outbuf, len); |