aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-29 14:58:31 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-29 14:58:31 +0200
commit3c5a3882f988aba19a984e80119d72ca9d32b7d4 (patch)
tree157468878c7e9dc9048d8b9694f6b2a239ca93f5
parentc54e2740e1f4a8fb7fa4e521755bf4158c4cda51 (diff)
parent77a1e2c5f8f8250dfacff24b993eb473260ed13e (diff)
downloadffmpeg-3c5a3882f988aba19a984e80119d72ca9d32b7d4.tar.gz
Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'
* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e': h264: move direct mode inits out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
-rw-r--r--libavcodec/h264_slice.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index cab674fba9..497a99cdca 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) ||