[FFmpeg-cvslog] avcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function

Michael Niedermayer git at videolan.org
Fri Feb 27 18:59:45 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 27 18:37:36 2015 +0100| [b37c3396cd36b13ad147837a07e03e32907da433] | committer: Michael Niedermayer

avcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b37c3396cd36b13ad147837a07e03e32907da433
---

 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 a323098..8ec46df 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -467,7 +467,7 @@ int ff_h264_alloc_tables(H264Context *h)
         }
 
     if (!h->dequant4_coeff[0])
-        h264_init_dequant_tables(h);
+        ff_h264_init_dequant_tables(h);
 
     if (!h->DPB) {
         h->DPB = av_mallocz_array(H264_MAX_PICTURE_COUNT, sizeof(*h->DPB));
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 2d363c9..21e9952 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -866,7 +866,7 @@ int ff_h264_decode_mb_cabac(H264Context *h);
 
 void ff_h264_init_cabac_states(H264Context *h);
 
-void h264_init_dequant_tables(H264Context *h);
+void ff_h264_init_dequant_tables(H264Context *h);
 
 void ff_h264_direct_dist_scale_factor(H264Context *const h);
 void ff_h264_direct_ref_list_init(H264Context *const h);
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 2b8d27f..e9a89d1 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -362,7 +362,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);
@@ -1499,7 +1499,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
 
     if (first_slice && 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(&h->gb, h->sps.log2_max_frame_num);



More information about the ffmpeg-cvslog mailing list