diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:37:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:37:55 +0200 |
| commit | 8c320b3c0831b181585c8285e0b43d1a62fecc52 (patch) | |
| tree | 16267beba7d9dd713febef8916b280d2d39c96e4 | |
| parent | 391e272c163723a48609f1794f76064018847c0d (diff) | |
| parent | a9d50bb578ec04c085a25f1e023f75e0e4499d5e (diff) | |
| download | ffmpeg-8c320b3c0831b181585c8285e0b43d1a62fecc52.tar.gz | |
Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'
* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
dcadec: Validate the lfe parameter
Conflicts:
libavcodec/dcadec.c
See: 3b2cd83a829e01a603b52fdc058a054b7899d06e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dcadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 4fa7f894b5..fbe9b01896 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -735,10 +735,10 @@ static int dca_parse_frame_header(DCAContext *s) s->lfe = get_bits(&s->gb, 2); s->predictor_history = get_bits(&s->gb, 1); - if (s->lfe == 3) { + if (s->lfe > 2) { s->lfe = 0; - avpriv_request_sample(s->avctx, "LFE = 3"); - return AVERROR_PATCHWELCOME; + av_log(s->avctx, AV_LOG_ERROR, "Invalid LFE value: %d\n", s->lfe); + return AVERROR_INVALIDDATA; } /* TODO: check CRC */ |