summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.c2
-rw-r--r--libavcodec/dnxhddata.c4
-rw-r--r--libavcodec/dvdata.h4
-rw-r--r--libavcodec/h263.c2
-rw-r--r--libavcodec/h264.c6
-rw-r--r--libavcodec/imgresample.c2
-rw-r--r--libavcodec/mimic.c2
-rw-r--r--libavcodec/mpegaudiodec.c4
-rw-r--r--libavcodec/utils.c4
-rw-r--r--libavcodec/vorbis_enc.c2
10 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 35c2945b74..a207ce119f 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -403,7 +403,7 @@ static av_cold int aac_decode_init(AVCodecContext * avccontext) {
ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.);
#endif /* CONFIG_HARDCODED_TABLES */
- INIT_VLC_STATIC(&vlc_scalefactors, 7, sizeof(ff_aac_scalefactor_code)/sizeof(ff_aac_scalefactor_code[0]),
+ INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]),
ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]),
352);
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index c1f2671c9d..47467ff71b 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -418,7 +418,7 @@ const CIDEntry ff_dnxhd_cid_table[] = {
int ff_dnxhd_get_cid_table(int cid)
{
int i;
- for (i = 0; i < sizeof(ff_dnxhd_cid_table)/sizeof(CIDEntry); i++)
+ for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++)
if (ff_dnxhd_cid_table[i].cid == cid)
return i;
return -1;
@@ -430,7 +430,7 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx)
int mbs = avctx->bit_rate/1000000;
if (!mbs)
return 0;
- for (i = 0; i < sizeof(ff_dnxhd_cid_table)/sizeof(CIDEntry); i++) {
+ for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++) {
const CIDEntry *cid = &ff_dnxhd_cid_table[i];
if (cid->width == avctx->width && cid->height == avctx->height &&
cid->interlaced == !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT) &&
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 5364310198..5bc21bccde 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -6386,7 +6386,7 @@ static inline const DVprofile* dv_frame_profile(const uint8_t* frame)
return &dv_profiles[2];
}
- for (i=0; i<sizeof(dv_profiles)/sizeof(DVprofile); i++)
+ for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
if (dsf == dv_profiles[i].dsf && stype == dv_profiles[i].video_stype)
return &dv_profiles[i];
@@ -6397,7 +6397,7 @@ static const DVprofile* dv_codec_profile(AVCodecContext* codec)
{
int i;
- for (i=0; i<sizeof(dv_profiles)/sizeof(DVprofile); i++)
+ for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
if (codec->height == dv_profiles[i].height && codec->pix_fmt == dv_profiles[i].pix_fmt &&
codec->width == dv_profiles[i].width)
return &dv_profiles[i];
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index e490995742..47210e9c9e 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -587,7 +587,7 @@ void ff_clean_mpeg4_qscales(MpegEncContext *s){
#endif //CONFIG_ENCODERS
-#define tab_size ((signed)(sizeof(s->direct_scale_mv[0])/sizeof(int16_t)))
+#define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0]))
#define tab_bias (tab_size/2)
void ff_mpeg4_init_direct_mv(MpegEncContext *s){
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6e16393702..ecd4fc742a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1979,7 +1979,7 @@ static av_cold void decode_init_vlc(void){
* the packed static coeff_token_vlc table sizes
* were initialized correctly.
*/
- assert(offset == sizeof(coeff_token_vlc_tables)/(sizeof(VLC_TYPE)*2));
+ assert(offset == FF_ARRAY_ELEMS(coeff_token_vlc_tables));
for(i=0; i<3; i++){
chroma_dc_total_zeros_vlc[i].table = chroma_dc_total_zeros_vlc_tables[i];
@@ -6888,7 +6888,7 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
if( aspect_ratio_idc == EXTENDED_SAR ) {
sps->sar.num= get_bits(&s->gb, 16);
sps->sar.den= get_bits(&s->gb, 16);
- }else if(aspect_ratio_idc < sizeof(pixel_aspect)/sizeof(*pixel_aspect)){
+ }else if(aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)){
sps->sar= pixel_aspect[aspect_ratio_idc];
}else{
av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
@@ -7072,7 +7072,7 @@ static inline int decode_seq_parameter_set(H264Context *h){
sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
tmp= get_ue_golomb(&s->gb);
- if(tmp >= sizeof(sps->offset_for_ref_frame) / sizeof(sps->offset_for_ref_frame[0])){
+ if(tmp >= FF_ARRAY_ELEMS(sps->offset_for_ref_frame)){
av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", tmp);
return -1;
}
diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index af945752a3..fa44248104 100644
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -790,7 +790,7 @@ int main(int argc, char **argv)
}
}
save_pgm("/tmp/in.pgm", img, XSIZE, YSIZE);
- for(i=0;i<sizeof(factors)/sizeof(float);i++) {
+ for(i=0;i<FF_ARRAY_ELEMS(factors);i++) {
fact = factors[i];
xsize = (int)(XSIZE * fact);
ysize = (int)((YSIZE - 100) * fact);
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 527c7bcd00..b740275fc4 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -110,7 +110,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
ctx->prev_index = 0;
ctx->cur_index = 15;
- if(init_vlc(&ctx->vlc, 11, sizeof(huffbits)/sizeof(huffbits[0]),
+ if(init_vlc(&ctx->vlc, 11, FF_ARRAY_ELEMS(huffbits),
huffbits, 1, 1, huffcodes, 4, 4, 0)) {
av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n");
return -1;
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 86d9f6b5f4..a277492727 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -394,7 +394,7 @@ static int decode_init(AVCodecContext * avctx)
INIT_VLC_USE_NEW_STATIC);
offset += huff_vlc_tables_sizes[i];
}
- assert(offset == sizeof(huff_vlc_tables)/(sizeof(VLC_TYPE)*2));
+ assert(offset == FF_ARRAY_ELEMS(huff_vlc_tables));
offset = 0;
for(i=0;i<2;i++) {
@@ -405,7 +405,7 @@ static int decode_init(AVCodecContext * avctx)
INIT_VLC_USE_NEW_STATIC);
offset += huff_quad_vlc_tables_sizes[i];
}
- assert(offset == sizeof(huff_quad_vlc_tables)/(sizeof(VLC_TYPE)*2));
+ assert(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables));
for(i=0;i<9;i++) {
k = 0;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cc2a3a2a8d..5df4d18b6b 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1455,7 +1455,7 @@ static const VideoFrameRateAbbr video_frame_rate_abbrs[]= {
int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
{
int i;
- int n = sizeof(video_frame_size_abbrs) / sizeof(VideoFrameSizeAbbr);
+ int n = FF_ARRAY_ELEMS(video_frame_size_abbrs);
const char *p;
int frame_width = 0, frame_height = 0;
@@ -1483,7 +1483,7 @@ int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
int av_parse_video_frame_rate(AVRational *frame_rate, const char *arg)
{
int i;
- int n = sizeof(video_frame_rate_abbrs) / sizeof(VideoFrameRateAbbr);
+ int n = FF_ARRAY_ELEMS(video_frame_rate_abbrs);
char* cp;
/* First, we check our abbreviation table */
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index 7f2e876a03..0cb644b46b 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -213,7 +213,7 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
venc->sample_rate = avccontext->sample_rate;
venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11;
- venc->ncodebooks = sizeof(cvectors)/sizeof(cvectors[0]);
+ venc->ncodebooks = FF_ARRAY_ELEMS(cvectors);
venc->codebooks = av_malloc(sizeof(codebook_t) * venc->ncodebooks);
// codebook 0..14 - floor1 book, values 0..255
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 11:38:12 +0000