projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f44059d
)
dca: return error if the frame header is invalid
author
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 27 Oct 2011 15:42:23 +0000
(11:42 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 29 Oct 2011 20:04:07 +0000
(16:04 -0400)
libavcodec/dca.c
patch
|
blob
|
blame
|
history
diff --git
a/libavcodec/dca.c
b/libavcodec/dca.c
index
518fd30
..
deb7245
100644
(file)
--- a/
libavcodec/dca.c
+++ b/
libavcodec/dca.c
@@
-1637,7
+1637,7
@@
static int dca_decode_frame(AVCodecContext * avctx,
int lfe_samples;
int num_core_channels = 0;
- int i;
+ int i
, ret
;
float *samples_flt = data;
int16_t *samples_s16 = data;
int out_size;
@@
-1656,10
+1656,9
@@
static int dca_decode_frame(AVCodecContext * avctx,
}
init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);
- if (
dca_parse_frame_header(s
) < 0) {
+ if (
(ret = dca_parse_frame_header(s)
) < 0) {
//seems like the frame is corrupt, try with the next one
- *data_size=0;
- return buf_size;
+ return ret;
}
//set AVCodec values with parsed data
avctx->sample_rate = s->sample_rate;