ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 29 14:58:31 2016 +0200| [3c5a3882f988aba19a984e80119d72ca9d32b7d4] | committer: Clément Bœsch
Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e' * commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e': h264: move direct mode inits out of h264_slice_header_parse() Merged-by: Clément Bœsch <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c5a3882f988aba19a984e80119d72ca9d32b7d4 --- libavcodec/h264_slice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index cab674f..497a99c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1637,10 +1637,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) } } - if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) - ff_h264_direct_dist_scale_factor(h, sl); - ff_h264_direct_ref_list_init(h, sl); - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) { @@ -1714,6 +1710,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (ret < 0) return ret; + if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) + ff_h264_direct_dist_scale_factor(h, sl); + ff_h264_direct_ref_list_init(h, sl); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->nal_unit_type != NAL_IDR_SLICE) || ====================================================================== diff --cc libavcodec/h264_slice.c index cab674f,aefb375..497a99c --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@@ -1714,10 -1460,12 +1710,14 @@@ int ff_h264_decode_slice_header(H264Con if (ret < 0) return ret; + if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) + ff_h264_direct_dist_scale_factor(h, sl); + ff_h264_direct_ref_list_init(h, sl); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && + h->nal_unit_type != NAL_IDR_SLICE) || + (h->avctx->skip_loop_filter >= AVDISCARD_NONINTRA && sl->slice_type_nos != AV_PICTURE_TYPE_I) || (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && sl->slice_type_nos == AV_PICTURE_TYPE_B) || _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
