[FFmpeg-cvslog] ac3: Clean up the error paths
Luca Barbato
git at videolan.org
Wed Aug 28 12:27:26 CEST 2013
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Jul 28 13:32:18 2013 +0200| [818d1f1a3e89d35213af0bd5dc4a772713951882] | committer: Luca Barbato
ac3: Clean up the error paths
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=818d1f1a3e89d35213af0bd5dc4a772713951882
---
libavcodec/ac3dec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index f084493..2b0ebf4 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1305,7 +1305,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
/* skip frame if CRC is ok. otherwise use error concealment. */
/* TODO: add support for substreams and dependent frames */
if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT || s->substreamid) {
- av_log(avctx, AV_LOG_ERROR, "unsupported frame type : "
+ av_log(avctx, AV_LOG_WARNING, "unsupported frame type : "
"skipping frame\n");
*got_frame_ptr = 0;
return buf_size;
@@ -1313,9 +1313,12 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "invalid frame type\n");
}
break;
- default:
- av_log(avctx, AV_LOG_ERROR, "invalid header\n");
+ case AAC_AC3_PARSE_ERROR_CRC:
+ case AAC_AC3_PARSE_ERROR_CHANNEL_CFG:
break;
+ default: // Normal AVERROR do not try to recover.
+ *got_frame_ptr = 0;
+ return err;
}
} else {
/* check that reported frame size fits in input buffer */
More information about the ffmpeg-cvslog
mailing list