[FFmpeg-cvslog] lavc/h264: add a logging ctx to ff_h264_pred_weight_table()

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Jun 20 10:28:17 2016 +0200| [4fdea02d688cbe9a66db684b178180367cd5eb1b] | committer: Clément Bœsch

lavc/h264: add a logging ctx to ff_h264_pred_weight_table()

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

 libavcodec/h264_parse.c  |    6 +++---
 libavcodec/h264_parse.h  |    2 +-
 libavcodec/h264_parser.c |    2 +-
 libavcodec/h264_slice.c  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 58ca58a..a63530d 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -24,7 +24,7 @@
 
 int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
                               const int *ref_count, int slice_type_nos,
-                              H264PredWeightTable *pwt)
+                              H264PredWeightTable *pwt, void *logctx)
 {
     int list, i;
     int luma_def, chroma_def;
@@ -36,11 +36,11 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
         pwt->chroma_log2_weight_denom = get_ue_golomb(gb);
 
     if (pwt->luma_log2_weight_denom > 7U) {
-        av_log(NULL, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom);
+        av_log(logctx, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom);
         pwt->luma_log2_weight_denom = 0;
     }
     if (pwt->chroma_log2_weight_denom > 7U) {
-        av_log(NULL, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom);
+        av_log(logctx, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom);
         pwt->chroma_log2_weight_denom = 0;
     }
 
diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h
index 4fdba54..3ef640f 100644
--- a/libavcodec/h264_parse.h
+++ b/libavcodec/h264_parse.h
@@ -58,7 +58,7 @@ struct H264ParamSets;
 
 int ff_h264_pred_weight_table(GetBitContext *gb, const struct SPS *sps,
                               const int *ref_count, int slice_type_nos,
-                              H264PredWeightTable *pwt);
+                              H264PredWeightTable *pwt, void *logctx);
 
 /**
  * Check if the top & left blocks are available if needed & change the
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 1f871fd..7dde3d5 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -198,7 +198,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb,
     if ((p->ps.pps->weighted_pred && slice_type_nos == AV_PICTURE_TYPE_P) ||
         (p->ps.pps->weighted_bipred_idc == 1 && slice_type_nos == AV_PICTURE_TYPE_B))
         ff_h264_pred_weight_table(gb, p->ps.sps, ref_count, slice_type_nos,
-                                  &pwt);
+                                  &pwt, avctx);
 
     if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag
         int i;
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 2640c22..d8da424 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1654,7 +1654,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
         (pps->weighted_bipred_idc == 1 &&
          sl->slice_type_nos == AV_PICTURE_TYPE_B))
         ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count,
-                                  sl->slice_type_nos, &sl->pwt);
+                                  sl->slice_type_nos, &sl->pwt, h->avctx);
     else if (pps->weighted_bipred_idc == 2 &&
              sl->slice_type_nos == AV_PICTURE_TYPE_B) {
         implicit_weight_table(h, sl, -1);