On Tue, Mar 8, 2016 at 11:55 AM, Diego Biurrun <di...@biurrun.de> wrote: > --- > libavcodec/h264.c | 2 +- > libavcodec/h264.h | 2 +- > libavcodec/h264_slice.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-)
I'd use "internally public function" to avoid confusion with "public api" in the commit title > diff --git a/libavcodec/h264.c b/libavcodec/h264.c > index 0b5b6c2..e9c13cc 100644 > --- a/libavcodec/h264.c > +++ b/libavcodec/h264.c > @@ -424,7 +424,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; > > diff --git a/libavcodec/h264.h b/libavcodec/h264.h > index 72ad352..f96dab0 100644 > --- a/libavcodec/h264.h > +++ b/libavcodec/h264.h > @@ -849,7 +849,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); > diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c > index 8dde140..67cbc02 100644 > --- a/libavcodec/h264_slice.c > +++ b/libavcodec/h264_slice.c > @@ -371,7 +371,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); > @@ -1230,7 +1230,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); possibly ok -- Vittorio _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel