diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-08 14:15:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-08 14:23:48 -0300 |
| commit | bc987cf91dd9975b0949bb5f91b9f266ca53e0ff (patch) | |
| tree | 576c2374596c851ce3c45a04d52466e7acf3198e /libavcodec/h264_mb.c | |
| parent | 5fd6fa0ca7f32d800a6044d28fb33a88e8de7283 (diff) | |
| parent | 45c4bf3df03ef53ae61fa1473424d4ae024f22e4 (diff) | |
| download | ffmpeg-bc987cf91dd9975b0949bb5f91b9f266ca53e0ff.tar.gz | |
Merge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'
* commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4':
h264dec: track the last seen value of x264_build
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index cb9fe856b2..3cd17b7e4b 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -637,7 +637,7 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, uint8_t *const ptr = dest_y + block_offset[i]; const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; if (transform_bypass && h->ps.sps->profile_idc == 244 && dir <= 1) { - if (h->sei.unregistered.x264_build < 151U) { + if (h->x264_build < 151U) { h->hpc.pred8x8l_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift), linesize); } else h->hpc.pred8x8l_filter_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift), |