Do it where the normal implicit table is initialised.
---
libavcodec/h264_slice.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 33f9f57..031f8cc 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1357,6 +1357,10 @@ static int h264_slice_header_parse(H264Context *h,
H264SliceContext *sl)
else if (pps->weighted_bipred_idc == 2 &&
sl->slice_type_nos == AV_PICTURE_TYPE_B) {
implicit_weight_table(h, sl, -1);
+ if (FRAME_MBAFF(h)) {
+ implicit_weight_table(h, sl, 0);
+ implicit_weight_table(h, sl, 1);
+ }
} else {
sl->pwt.use_weight = 0;
for (i = 0; i < 2; i++) {
@@ -1378,13 +1382,6 @@ static int h264_slice_header_parse(H264Context *h,
H264SliceContext *sl)
return AVERROR_INVALIDDATA;
}
- if (FRAME_MBAFF(h)) {
- if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos ==
AV_PICTURE_TYPE_B) {
- implicit_weight_table(h, sl, 0);
- implicit_weight_table(h, sl, 1);
- }
- }
-
if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) {
tmp = get_ue_golomb_31(&sl->gb);
if (tmp > 2) {
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
