diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
| commit | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (patch) | |
| tree | 0cb290199a3e87504efbce8519dc80143e902281 /libavcodec/h264_mc_template.c | |
| parent | db4234c5002fc0ac7ecae323874b97a4547ae0c3 (diff) | |
| parent | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (diff) | |
| download | ffmpeg-668c65e7e73a21c86f43ffa1f79bf023fa44cbcd.tar.gz | |
Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'
* commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522':
h264: move mb_xy into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mc_template.c')
| -rw-r--r-- | libavcodec/h264_mc_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index d20ccc58f7..2ca82a321d 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -71,7 +71,7 @@ static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl, h264_weight_func *weight_op, h264_biweight_func *weight_avg) { - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; av_assert2(IS_INTER(mb_type)); |