Browse Source

h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()

tags/n3.1
Diego Biurrun 9 years ago
parent
commit
061dc20351
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      libavcodec/h264.c
  2. +1
    -1
      libavcodec/h264.h
  3. +2
    -2
      libavcodec/h264_slice.c

+ 1
- 1
libavcodec/h264.c View File

@@ -313,7 +313,7 @@ int ff_h264_alloc_tables(H264Context *h)
}

if (!h->dequant4_coeff[0])
h264_init_dequant_tables(h);
ff_h264_init_dequant_tables(h);

return 0;



+ 1
- 1
libavcodec/h264.h View File

@@ -829,7 +829,7 @@ int ff_h264_decode_mb_cabac(const H264Context *h, H264SliceContext *sl);

void ff_h264_init_cabac_states(const H264Context *h, H264SliceContext *sl);

void h264_init_dequant_tables(H264Context *h);
void ff_h264_init_dequant_tables(H264Context *h);

void ff_h264_direct_dist_scale_factor(const H264Context *const h, H264SliceContext *sl);
void ff_h264_direct_ref_list_init(const H264Context *const h, H264SliceContext *sl);


+ 2
- 2
libavcodec/h264_slice.c View File

@@ -335,7 +335,7 @@ static void init_dequant4_coeff_table(H264Context *h)
}
}

void h264_init_dequant_tables(H264Context *h)
void ff_h264_init_dequant_tables(H264Context *h)
{
int i, x;
init_dequant4_coeff_table(h);
@@ -1194,7 +1194,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)

if (sl == h->slice_ctx && h->dequant_coeff_pps != pps_id) {
h->dequant_coeff_pps = pps_id;
h264_init_dequant_tables(h);
ff_h264_init_dequant_tables(h);
}

frame_num = get_bits(&sl->gb, h->sps.log2_max_frame_num);


Loading…
Cancel
Save