* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736': h264: drop the now unused per-slice H264Contexts Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
22 KiB
22 KiB