virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

dca: handle errors from dca_decode_block()

Browse Source 
Return error if core block decoding fails.
Do not enable XCh if XCh extension block decoding fails.
This commit is contained in:
Justin Ruggles 2011-10-27 11:45:50 -04:00
parent aae6eead6a
commit 272fcc32bb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dca.c
View File

@ -1668,7 +1668,10 @@ static int dca_decode_frame(AVCodecContext * avctx,
s->profile = FF_PROFILE_DTS; s->profile = FF_PROFILE_DTS;
for (i = 0; i < (s->sample_blocks / 8); i++) { 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 */ /* 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); dca_parse_audio_coding_header(s, s->xch_base_channel);
for (i = 0; i < (s->sample_blocks / 8); i++) { 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; s->xch_present = 1;