Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:41:17 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:41:17 +0000 (21:41 +0100)
commit0f8bb0efc3cf9e2b86c7e518f24133ea358566d5
treedacb1546d0e82b1f27766c419b5dfddc877b42a5
parent8bdcec31116594b07e83a8845b64a5e8172884f2
parent5bf3c0fa49afd5bbf43aa841ff78007d72c80736
Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'

* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736':
  h264: drop the now unused per-slice H264Contexts

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_parser.c
libavcodec/h264_slice.c