* commit 'e26c6414':
  h264: discard slices of redundant pictures right after parsing the slice header

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/h264dec.c

TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com>