ffmpeg | branch: master | Clément Bœsch <clement@stupeflix.com> | Wed Jun 29 15:29:38 2016 +0200| [cdecb39fca81967ff9e021c776b3212b1870188e] | committer: Clément Bœsch Merge commit 'fa57059079190242517701120cfdccad93c866da' * commit 'fa57059079190242517701120cfdccad93c866da': h264: move initialising the implicit pred weight table for MBAFF Merged-by: Clément Bœsch <clement@stupeflix.com>

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

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 666d99f..522a36c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1607,6 +1607,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++) { @@ -1628,13 +1632,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) { ======================================================================