diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:18:29 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:18:29 +0300 |
commit | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (patch) | |
tree | 0cb290199a3e87504efbce8519dc80143e902281 /libavcodec/h264_direct.c | |
parent | db4234c5002fc0ac7ecae323874b97a4547ae0c3 (diff) | |
parent | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (diff) |
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_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 cee83cd6cc..891a24bf35 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -179,7 +179,7 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s { int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = h->mb_y; + int mb_xy = sl->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; @@ -466,7 +466,7 @@ static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl, { int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = h->mb_y; + int mb_xy = sl->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; |