[FFmpeg-cvslog] avcodec/ccaption_dec: do not modify pkt data and stop removing parity bit twice

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jun 17 00:35:37 2020 +0200| [c0974355c7f049eb791ec1d7d5362b700ab51783] | committer: Paul B Mahol

avcodec/ccaption_dec: do not modify pkt data and stop removing parity bit twice

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

 libavcodec/ccaption_dec.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index f73b33a003..87ac23e0d1 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -367,10 +367,6 @@ static int validate_cc_data_pair(uint8_t *cc_data_pair)
     if (cc_type == 3 || cc_type == 2)
         return AVERROR_PATCHWELCOME;
 
-    /* remove parity bit */
-    cc_data_pair[1] &= 0x7F;
-    cc_data_pair[2] &= 0x7F;
-
     return 0;
 }
 
@@ -799,9 +795,8 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
         /* ignoring data field 1 */
         if (cc_type == 1)
             continue;
-        else
-            ret = process_cc608(ctx, start_time, *(bptr + i + 1) & 0x7f, *(bptr + i + 2) & 0x7f);
 
+        ret = process_cc608(ctx, start_time, bptr[i + 1] & 0x7f, bptr[i + 2] & 0x7f);
         if (ret < 0)
             return ret;