diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 066aafced4dc6c7c9e7b37082635472249f1e93e (patch) | |
| tree | 86888b90a0078a5fa65a3af3e7ddd07869c7cfc0 /libavcodec/h264_direct.c | |
| parent | ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff) | |
| download | ffmpeg-066aafced4dc6c7c9e7b37082635472249f1e93e.tar.gz | |
h264: move direct_spatial_mv_pred into the per-slice context
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index f94469522d..cd30dd33f2 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -140,7 +140,7 @@ void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl) h->col_fieldoff = 2 * h->ref_list[1][0].reference - 3; } - if (sl->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) + if (sl->slice_type_nos != AV_PICTURE_TYPE_B || sl->direct_spatial_mv_pred) return; for (list = 0; list < 2; list++) { @@ -694,7 +694,7 @@ single_col: void ff_h264_pred_direct_motion(H264Context *const h, H264SliceContext *sl, int *mb_type) { - if (h->direct_spatial_mv_pred) + if (sl->direct_spatial_mv_pred) pred_spatial_direct_motion(h, sl, mb_type); else pred_temp_direct_motion(h, sl, mb_type); |