ffmpeg | branch: master | Diego Biurrun <di...@biurrun.de> | Tue Mar 8 17:37:04 2016 +0100| [061dc20351bf3b8a237216d2b39d3a3b736d1916] | committer: Diego Biurrun
h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=061dc20351bf3b8a237216d2b39d3a3b736d1916 --- libavcodec/h264.c | 2 +- libavcodec/h264.h | 2 +- libavcodec/h264_slice.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 94fe1a8..acda35b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index a7b1d58..796d5d5 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -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); diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4ffac6f..23824db 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
