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

Merge commit 'c12c085be7e86880924249e5cb3f898e45dee134'

Browse Source 
* commit 'c12c085be7e86880924249e5cb3f898e45dee134':
  dcadec: Do not check for overreads in auxiliary data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-11-29 15:32:27 +01:00
parent 4aa900acbd c12c085be7
commit b7855daffe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dcadec.c
View File

@@ -1165,12 +1165,12 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
align_get_bits(&s->gb); // byte align align_get_bits(&s->gb); // byte align
skip_bits(&s->gb, 16); // nAUXCRC16 skip_bits(&s->gb, 16); // nAUXCRC16
// additional data (reserved, cf. ETSI TS 102 114 V1.4.1) /*
if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) { * additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
av_log(s->avctx, AV_LOG_ERROR, *
"Overread auxiliary data by %d bits\n", -reserved); * Note: don't check for overreads, aux_data_count can't be trusted.
return AVERROR_INVALIDDATA; */
} else if (reserved) { if ((reserved = (aux_data_end - get_bits_count(&s->gb))) > 0) {
avpriv_request_sample(s->avctx, avpriv_request_sample(s->avctx,
"Core auxiliary data reserved content"); "Core auxiliary data reserved content");
skip_bits_long(&s->gb, reserved); skip_bits_long(&s->gb, reserved);