Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

[ffmpeg] / libavcodec / h264_parse.h

diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h
index 4fdba545439d31126a59bf40b253580e47860db9..40d88ede78b6632336cb848732409cb6e06f479a 100644 (file)
--- a/libavcodec/h264_parse.h
+++ b/libavcodec/h264_parse.h
@@ -33,7 +33,7 @@ typedef struct H264PredWeightTable {
     int chroma_log2_weight_denom;
     int luma_weight_flag[2];    ///< 7.4.3.2 luma_weight_lX_flag
     int chroma_weight_flag[2];  ///< 7.4.3.2 chroma_weight_lX_flag
-    // The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss
+    // The following 2 can be changed to int8_t but that causes a 10 CPU cycles speed loss
     int luma_weight[48][2][2];
     int chroma_weight[48][2][2][2];
     int implicit_weight[48][48][2];
@@ -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