-
Michael Niedermayer authored
* commit 'e49e0f58': h264: make sure the slices do not overlap during slice threading Conflicts: libavcodec/h264.h libavcodec/h264_slice.c See: 43b43421Merged-by: Michael Niedermayer <michaelni@gmx.at>
f620315f
* commit 'e49e0f58': h264: make sure the slices do not overlap during slice threading Conflicts: libavcodec/h264.h libavcodec/h264_slice.c See: 43b43421Merged-by: Michael Niedermayer <michaelni@gmx.at>