virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'

Browse Source 
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

See: a9cd12ee2afb3f3aad783c396816b23d8513f472

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-12 13:25:28 +02:00
commit e9348e107b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/mlpdec.c
View File

@ -401,10 +401,10 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
uint8_t checksum; uint8_t checksum;
uint8_t lossless_check; uint8_t lossless_check;
int start_count = get_bits_count(gbp); int start_count = get_bits_count(gbp);
const int max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP int min_channel, max_channel, max_matrix_channel;
? MAX_MATRIX_CHANNEL_MLP const int std_max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP
: MAX_MATRIX_CHANNEL_TRUEHD; ? MAX_MATRIX_CHANNEL_MLP
int max_channel, min_channel, matrix_channel; : MAX_MATRIX_CHANNEL_TRUEHD;
sync_word = get_bits(gbp, 13); sync_word = get_bits(gbp, 13);
@ -423,18 +423,18 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
skip_bits(gbp, 16); /* Output timestamp */ skip_bits(gbp, 16); /* Output timestamp */
min_channel = get_bits(gbp, 4); min_channel = get_bits(gbp, 4);
max_channel = get_bits(gbp, 4); max_channel = get_bits(gbp, 4);
matrix_channel = get_bits(gbp, 4); max_matrix_channel = get_bits(gbp, 4);
if (matrix_channel > max_matrix_channel) { if (max_matrix_channel > std_max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR, av_log(m->avctx, AV_LOG_ERROR,
"Max matrix channel cannot be greater than %d.\n", "Max matrix channel cannot be greater than %d.\n",
max_matrix_channel); std_max_matrix_channel);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (max_channel != matrix_channel) { if (max_channel != max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR, av_log(m->avctx, AV_LOG_ERROR,
"Max channel must be equal max matrix channel.\n"); "Max channel must be equal max matrix channel.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -456,9 +456,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->min_channel = min_channel; s->min_channel = min_channel;
s->max_channel = max_channel; s->max_channel = max_channel;
s->max_matrix_channel = matrix_channel; s->max_matrix_channel = max_matrix_channel;
#if FF_API_REQUEST_CHANNELS #if FF_API_REQUEST_CHANNELS
if (m->avctx->request_channels > 0 && if (m->avctx->request_channels > 0 &&