diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:37:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:37:55 +0100 |
| commit | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (patch) | |
| tree | 86c21a7454f7c1ffd7897b78b42280414d9e1ef0 /libavcodec/h264_mc_template.c | |
| parent | 97c8ecaadab4e246d969fadd44072025b64747e4 (diff) | |
| parent | ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff) | |
Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'
* commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6':
h264: move sub_mb_type into the per-slice context
Conflicts:
libavcodec/h264_cabac.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 32b7a3c3af..d20ccc58f7 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -109,7 +109,7 @@ static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl, av_assert2(IS_8X8(mb_type)); for (i = 0; i < 4; i++) { - const int sub_mb_type = h->sub_mb_type[i]; + const int sub_mb_type = sl->sub_mb_type[i]; const int n = 4 * i; int x_offset = (i & 1) << 2; int y_offset = (i & 2) << 1; |