Original commit message from CVS: Make sure we use proper properties to define the different AVI types.