Remove an apparently unneeded && !FRAME_MBAFF.