Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9d887c225466576ae80ef7f2b109e866ff137b2)

Conflicts:

	libavcodec/h264.c
h264: skip error concealment when SPS and slices are mismatching

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d)

Conflicts:

	libavcodec/h264.c