* commit 'ee6280ca':
  h264: parse two additional constraint flags

Conflicts:
	libavcodec/h264_ps.c

See: 9091ba9dMerged-by: Michael Niedermayer <michaelni@gmx.at>