RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 18:02:11 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul B Mahol 2020-06-17 00:35:37 +02:00
parent 5422a4a7c5
commit c0974355c7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/ccaption_dec.c
View File

@ -367,10 +367,6 @@ static int validate_cc_data_pair(uint8_t *cc_data_pair)
if (cc_type == 3 || cc_type == 2) if (cc_type == 3 || cc_type == 2)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
/* remove parity bit */
cc_data_pair[1] &= 0x7F;
cc_data_pair[2] &= 0x7F;
return 0; return 0;
} }
@ -799,9 +795,8 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
/* ignoring data field 1 */ /* ignoring data field 1 */
if (cc_type == 1) if (cc_type == 1)
continue; 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) if (ret < 0)
return ret; return ret;