dca: handle errors from dca_decode_block()

Return error if core block decoding fails.
Do not enable XCh if XCh extension block decoding fails.

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index deb7245256d44ecec4514be645a8f0cab6889222..7f7bcf9cfd077ac9d52c7d80c6f9906db13f1d1f 100644 (file)
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1668,7 +1668,10 @@ static int dca_decode_frame(AVCodecContext * avctx,
     s->profile = FF_PROFILE_DTS;
 
     for (i = 0; i < (s->sample_blocks / 8); i++) {
-        dca_decode_block(s, 0, i);
+        if ((ret = dca_decode_block(s, 0, i))) {
+            av_log(avctx, AV_LOG_ERROR, "error decoding block\n");
+            return ret;
+        }
     }
 
     /* record number of core channels incase less than max channels are requested */
@@ -1724,7 +1727,10 @@ static int dca_decode_frame(AVCodecContext * avctx,
             dca_parse_audio_coding_header(s, s->xch_base_channel);
 
             for (i = 0; i < (s->sample_blocks / 8); i++) {
-                dca_decode_block(s, s->xch_base_channel, i);
+                if ((ret = dca_decode_block(s, s->xch_base_channel, i))) {
+                    av_log(avctx, AV_LOG_ERROR, "error decoding XCh extension\n");
+                    continue;
+                }
             }
 
             s->xch_present = 1;