* commit '71cabb52':
  h264: do not discard NAL_SEI when skipping frames

Conflicts:
	libavcodec/h264.c

See: 7d75fb38Merged-by: Michael Niedermayer <michaelni@gmx.at>