virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Revert "mpegaudiodec_template: disable CRC checking for layers 1 and 2"

Browse Source 
This reverts commit b48397e7b8.

The change did not disable crc checks for layer 1 & 2, it removed reading
the CRC field.

Fixes decoding some mp2 samples and FATE test failures.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2020-08-03 10:27:21 -03:00
parent b068cfccdd
commit 9afd1f6ff2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegaudiodec_template.c
View File

@@ -1566,7 +1566,7 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT **samples,
init_get_bits(&s->gb, buf + HEADER_SIZE, (buf_size - HEADER_SIZE) * 8); init_get_bits(&s->gb, buf + HEADER_SIZE, (buf_size - HEADER_SIZE) * 8);
if (s->error_protection && s->layer == 3) { if (s->error_protection) {
uint16_t crc = get_bits(&s->gb, 16); uint16_t crc = get_bits(&s->gb, 16);
if (s->err_recognition & AV_EF_CRCCHECK) { if (s->err_recognition & AV_EF_CRCCHECK) {
const int sec_len = s->lsf ? ((s->nb_channels == 1) ? 9 : 17) : const int sec_len = s->lsf ? ((s->nb_channels == 1) ? 9 : 17) :