diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
| commit | a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3 (patch) | |
| tree | fb5114ebcffba281026acf7503aba6aa8212da8b /libavcodec/h264_direct.c | |
| parent | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (diff) | |
| parent | 066aafced4dc6c7c9e7b37082635472249f1e93e (diff) | |
| download | ffmpeg-a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3.tar.gz | |
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
h264: move direct_spatial_mv_pred into the per-slice context
Conflicts:
libavcodec/h264_mvpred.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 8d6ee4b756..12df16d838 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++) { @@ -695,7 +695,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); |