diff options
| author | James Almer <jamrial@gmail.com> | 2016-01-07 19:59:03 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-01-07 20:04:24 -0300 |
| commit | 28d5a3a74aee33786673925a46a310c773e94748 (patch) | |
| tree | 7aefda60e72e310798accd4f9ccda8a9218de686 /libavcodec | |
| parent | a1136ca973e3b216804d05bbf64fcc19ad0f14da (diff) | |
lavu: rename and move ff_parity to av_parity
av_popcount is not defined in intmath.h.
Reviewed-by: ubitux
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ccaption_dec.c | 4 | ||||
| -rw-r--r-- | libavcodec/g729dec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index bdfe35fe70..310f25ef8b 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -202,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 (!ff_parity(cc_data_pair[2])) { + if (!av_parity(cc_data_pair[2])) { return AVERROR_INVALIDDATA; } - if (!ff_parity(cc_data_pair[1])) { + if (!av_parity(cc_data_pair[1])) { cc_data_pair[1]=0x7F; } } diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 7265883b0e..2e1bf18e4e 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -472,7 +472,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, ac_index = get_bits(&gb, format->ac_index_bits[i]); if(!i && format->parity_bit) - bad_pitch = ff_parity(ac_index >> 2) == get_bits1(&gb); + bad_pitch = av_parity(ac_index >> 2) == get_bits1(&gb); fc_indexes = get_bits(&gb, format->fc_indexes_bits); pulses_signs = get_bits(&gb, format->fc_signs_bits); gc_1st_index = get_bits(&gb, format->gc_1st_index_bits); |