virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mlpdec: Check for {matrix,filter}_changed as soon as they are incremented.

Browse Source 
Originally committed as revision 18610 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2009-04-18 18:51:43 +00:00
parent 1b7bc4a245
commit 5d9e4eaa6d
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/mlpdec.c
View File

@ -446,7 +446,10 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp,
// Filter is 0 for FIR, 1 for IIR. // Filter is 0 for FIR, 1 for IIR.
assert(filter < 2); assert(filter < 2);
m->filter_changed[channel][filter]++; if (m->filter_changed[channel][filter]++ > 1) {
av_log(m->avctx, AV_LOG_ERROR, "Filters may change only once per access unit.\n");
return -1;
}
order = get_bits(gbp, 4); order = get_bits(gbp, 4);
if (order > max_order) { if (order > max_order) {
@ -508,8 +511,12 @@ static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *
{ {
unsigned int mat, ch; unsigned int mat, ch;
if (m->matrix_changed++ > 1) {
av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n");
return -1;
}
s->num_primitive_matrices = get_bits(gbp, 4); s->num_primitive_matrices = get_bits(gbp, 4);
m->matrix_changed++;
for (mat = 0; mat < s->num_primitive_matrices; mat++) { for (mat = 0; mat < s->num_primitive_matrices; mat++) {
int frac_bits, max_chan; int frac_bits, max_chan;
@ -1013,8 +1020,6 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
s->blockpos = 0; s->blockpos = 0;
do { do {
unsigned int ch;
if (get_bits1(&gb)) { if (get_bits1(&gb)) {
if (get_bits1(&gb)) { if (get_bits1(&gb)) {
/* A restart header should be present. */ /* A restart header should be present. */
@ -1031,17 +1036,6 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
goto next_substr; goto next_substr;
} }
if (m->matrix_changed > 1) {
av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n");
goto next_substr;
}
for (ch = 0; ch < s->max_channel; ch++)
if (m->filter_changed[ch][FIR] > 1 ||
m->filter_changed[ch][IIR] > 1) {
av_log(m->avctx, AV_LOG_ERROR, "Filters may change only once per access unit.\n");
goto next_substr;
}
if (!s->restart_seen) { if (!s->restart_seen) {
goto next_substr; goto next_substr;
} }