Based on commit 85c85fffff3f9c75301db3eba1bd5f2fb1e6285d.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/h264_parse.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index a075443d17..8bdd886000 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -62,8 +62,11 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS
*sps,
pwt->luma_weight[i][list][0] = get_se_golomb(gb);
pwt->luma_weight[i][list][1] = get_se_golomb(gb);
if ((int8_t)pwt->luma_weight[i][list][0] !=
pwt->luma_weight[i][list][0] ||
- (int8_t)pwt->luma_weight[i][list][1] !=
pwt->luma_weight[i][list][1])
+ (int8_t)pwt->luma_weight[i][list][1] !=
pwt->luma_weight[i][list][1]) {
+ pwt->luma_weight[i][list][0] = luma_def;
+ pwt->luma_weight[i][list][1] = 0;
goto out_range_weight;
+ }
if (pwt->luma_weight[i][list][0] != luma_def ||
pwt->luma_weight[i][list][1] != 0) {
pwt->use_weight = 1;
--
2.21.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
