diff options
| author | Clément Bœsch <u@pkh.me> | 2016-01-03 18:31:54 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-01-07 22:51:36 +0100 |
| commit | 00e96613f3e09bff21126814dbfc0dccdfc4159f (patch) | |
| tree | 5046c840f07fb376490b94deda6425d6f3e66937 | |
| parent | 2ce29d17656fab36286a76a9bb68e001e2815a3d (diff) | |
| download | ffmpeg-00e96613f3e09bff21126814dbfc0dccdfc4159f.tar.gz | |
lavc/ccaption_dec: use ff_parity()
| -rw-r--r-- | libavcodec/ccaption_dec.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 8ee2c651e2..bdfe35fe70 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -100,40 +100,6 @@ static const unsigned char pac2_attribs[32][3] = // Color, font, ident /* total 32 entries */ }; -/* 0-255 needs 256 spaces */ -static const uint8_t parity_table[256] = { 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0, - 0, 1, 1, 0, 1, 0, 0, 1, - 0, 1, 1, 0, 1, 0, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 0 }; - struct Screen { /* +1 is used to compensate null character of string */ uint8_t characters[SCREEN_ROWS][SCREEN_COLUMNS+1]; @@ -236,10 +202,10 @@ static int validate_cc_data_pair(uint8_t *cc_data_pair) // if EIA-608 data then verify parity. if (cc_type==0 || cc_type==1) { - if (!parity_table[cc_data_pair[2]]) { + if (!ff_parity(cc_data_pair[2])) { return AVERROR_INVALIDDATA; } - if (!parity_table[cc_data_pair[1]]) { + if (!ff_parity(cc_data_pair[1])) { cc_data_pair[1]=0x7F; } } |