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_slice.c | |
| parent | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (diff) | |
| parent | 066aafced4dc6c7c9e7b37082635472249f1e93e (diff) | |
| download | ffmpeg-streaming-a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3.zip ffmpeg-streaming-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_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 10eec2e..3a4e525 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1851,7 +1851,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex } } - 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) ff_h264_direct_dist_scale_factor(h); ff_h264_direct_ref_list_init(h, sl); @@ -2018,7 +2018,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex h->slice_alpha_c0_offset, h->slice_beta_offset, sl->use_weight, sl->use_weight == 1 && sl->use_weight_chroma ? "c" : "", - sl->slice_type == AV_PICTURE_TYPE_B ? (h->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""); + sl->slice_type == AV_PICTURE_TYPE_B ? (sl->direct_spatial_mv_pred ? "SPAT" : "TEMP") : ""); } return 0; |
