[FFmpeg-cvslog] Revert "mpegaudiodec_template: disable CRC checking for layers 1 and 2"

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Aug  3 10:27:21 2020 -0300| [9afd1f6ff2652daefd134350171f35f97c3e069b] | committer: James Almer

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

This reverts commit b48397e7b84864f2d4c70361a4c4bed93e826753.

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9afd1f6ff2652daefd134350171f35f97c3e069b
---

 libavcodec/mpegaudiodec_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index f03d7bc275..3d7e3ba4f2 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -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);
 
-    if (s->error_protection && s->layer == 3) {
+    if (s->error_protection) {
         uint16_t crc = get_bits(&s->gb, 16);
         if (s->err_recognition & AV_EF_CRCCHECK) {
             const int sec_len = s->lsf ? ((s->nb_channels == 1) ? 9  : 17) :